1 changed files with 1 additions and 9 deletions
--- a/1.txt
+++ b/1.txt
@ -1,11 +1,3 @@
 111
 <<<<<<< HEAD
 222
 branch1
-333
+again
 again
 branch2
 =======
 branch1
 again
 >>>>>>> 9c72f07223f0fb6a4a688bd9a0fbec8e73ab5108