diff --git a/doc/111.txt b/doc/111.txt
index 41e8b00..ffd78ec 100644
--- a/doc/111.txt
+++ b/doc/111.txt
@@ -1,7 +1,4 @@
-<<<<<<< HEAD
 111
-=======
-111
-branch
-pull request
->>>>>>> liuyutin_branch
+branch1
+branch2
+pull request
\ No newline at end of file