1 changed files with 6 additions and 1 deletions
--- a/111.txt
+++ b/111.txt
@ -1,3 +1,8 @@
 111
+<<<<<<< HEAD
+xjbxj
 111
-bxj666a_branch
+=======
+111
+bxj666a_branch
+>>>>>>> 08ea44e196a05fa557e640caa5be586d9d38b940