diff --git a/1.txt b/1.txt
index e29a5b7..3457b98 100644
--- a/1.txt
+++ b/1.txt
@@ -1,3 +1,7 @@
 42120412
 branch1
-branch2
\ No newline at end of file
+<<<<<<< HEAD
+branch2
+=======
+branch2
+>>>>>>> branch2