diff --git a/1.txt b/1.txt
index 78d9c84..8feabcb 100644
--- a/1.txt
+++ b/1.txt
@@ -1,7 +1,5 @@
 <<<<<<< HEAD
 111
-branc1
-=======
-111
->>>>>>> 018c7cd44cba6d6b00221a17621febf027b46c75
+branch1
+branch2
 pull request
\ No newline at end of file