diff --git a/111.txt b/111.txt
index 4c140eb..2140f06 100644
--- a/111.txt
+++ b/111.txt
@@ -1,3 +1,7 @@
 111
+<<<<<<< HEAD
 a_branch
-333
\ No newline at end of file
+333
+=======
+develop
+>>>>>>> e4c801818503ac14a2079a15e3abd5156f3a075d