diff --git a/1.txt b/1.txt
index 156511a..3aba44f 100644
--- a/1.txt
+++ b/1.txt
@@ -1 +1,6 @@
-text1
\ No newline at end of file
+<<<<<<< HEAD
+text1
+=======
+test
+branch1
+>>>>>>> branch1