Update 1.txt

1 changed files with 1 additions and 4 deletions
--- a/1.txt
+++ b/1.txt
@ -1,5 +1,2 @@
-<<<<<<< HEAD
 222
-=======
-b1
->>>>>>> branch1
+b1