diff --git a/doc/1111.txt b/doc/1111.txt
index 32192e8..822b4fb 100644
--- a/doc/1111.txt
+++ b/doc/1111.txt
@@ -1,3 +1,8 @@
 1111
+<<<<<<< HEAD
 22
-5555
\ No newline at end of file
+5555
+=======
+3333
+4444
+>>>>>>> 6ff2c6487638411e964f63aefe8be6c2c40a0946