diff --git a/doc/1.txt b/doc/1.txt
index 7787faa..72ac5b3 100644
--- a/doc/1.txt
+++ b/doc/1.txt
@@ -1,2 +1,7 @@
+<<<<<<< HEAD
 111
-222
\ No newline at end of file
+222
+=======
+222
+333
+>>>>>>> main