diff --git a/toto b/toto
index 3cd68e816d5f4858888276f5f2ad4187f84770f8..7a5154188bbf04c557cc2738c6c4cb16438088c9 100644
--- a/toto
+++ b/toto
@@ -1 +1,2 @@
-Ceci est toto modifié.
\ No newline at end of file
+Ceci est toto modifié.
+This is a change that has a conflict
\ No newline at end of file