diff --git a/1.txt b/1.txt
index dffc159..850a74f 100644
--- a/1.txt
+++ b/1.txt
@@ -1,2 +1,6 @@
+<<<<<<< HEAD
 111
-branc1
\ No newline at end of file
+branc1
+=======
+111
+>>>>>>> 018c7cd44cba6d6b00221a17621febf027b46c75