diff --git a/doc/222.txt b/doc/222.txt
index 710608b..18b0227 100644
--- a/doc/222.txt
+++ b/doc/222.txt
@@ -1 +1,5 @@
-branch2 testmain   abc
\ No newline at end of file
+<<<<<<< HEAD
+branch2 testmain   abc
+=======
+branch2 testbranch  bcd
+>>>>>>> lixihang_branch