diff --git a/1.txt b/1.txt
index 6dd90d2..932209e 100644
--- a/1.txt
+++ b/1.txt
@@ -1 +1,5 @@
-222
\ No newline at end of file
+<<<<<<< HEAD
+222
+=======
+b1
+>>>>>>> branch1