diff --git a/1.txt b/1.txt
index 383efb4..7c853af 100644
--- a/1.txt
+++ b/1.txt
@@ -1,7 +1,2 @@
-<<<<<<< .mine
-
-
-=======
 111
-branch1
->>>>>>> .theirs
+branch1
\ No newline at end of file