diff --git a/conflict b/conflict
index 06da6cba5f4ba4bd4c4a3f257368fcb38df3c18e..eeb4d9a2a8c4061c93fb8d64b9464d7dd4ca1296 100644
--- a/conflict
+++ b/conflict
@@ -1,3 +1,3 @@
 to create
 a
-conflict
\ No newline at end of file
+conflictSimon