2 changed files with 2 additions and 6 deletions
--- a/1.txt.txt
+++ b/1.txt.txt
@ -1,6 +1,2 @@
 111
 branch1
-<<<<<<< HEAD
-=======
-branch2
->>>>>>> ce673b182f289e0052f64a841780e0578b0e1ace