a conflict that should be auto fixable

diff --git a/test1.txt b/test1.txt
index c14422ec8ea0a3648e38bd0d5cfd4a539797d202..d864e6969e77659daedba00454a5b792ea9adb09 100644 (file)
--- a/test1.txt
+++ b/test1.txt
@@ -1,4 +1,4 @@
-This will be my test file. User2 has added some text. User2 add some more text.
+This will be my test file. User2 has added some text. User2 add some more text. USER1 non-conflict edit. 
 
 The second line USER2 ADDED TEXT will be the one that should trigger a conflict.