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