diff --git a/1.txt b/1.txt
index 7c853af..4ff9d30 100644
--- a/1.txt
+++ b/1.txt
@@ -1,2 +1,6 @@
+<<<<<<< HEAD
 111
-branch1
\ No newline at end of file
+branch1
+=======
+111
+>>>>>>> e6f58e78a1f9d84f2d54a392f6c132c137a6a0f4