--- a/README	Wed Oct 03 10:54:07 2012 +0200
+++ b/README	Wed Oct 03 11:02:12 2012 +0200
@@ -1,9 +1,4 @@
-This is the first file commited to the repo
-Add another line
-and another
-stil one line
-blah blah
-This is a line added by TC
+Voici de lourdes modifications pour compliquer le merge
 
 Hello world  by  Santiago
 
@@ -13,6 +8,8 @@
 
 beep beep
 
+Hello World
+
 toto from gautier
 In branch boris - merged
 
@@ -22,3 +19,5 @@
 asdfsa
 
 Nouvelle ligne
+
+Moi aussi j'écris à la fin
\ No newline at end of file