diff --git a/doc/1.txt b/doc/1.txt
index 9d07aa0..0fbcd58 100644
--- a/doc/1.txt
+++ b/doc/1.txt
@@ -1 +1,6 @@
-111
\ No newline at end of file
+<<<<<<< HEAD
+111
+ pull-request
+=======
+111
+>>>>>>> b00145a3663772c7987d4e7a127975bf64bafc43