a conflict that should auto-solve

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