diff --git a/1.txt b/1.txt
index 9ed5048..18f7864 100644
--- a/1.txt
+++ b/1.txt
@@ -1,8 +1,4 @@
 42120412
 branch1
-<<<<<<< HEAD
 branch2
-=======
-branch2
->>>>>>> branch2
-pull
+