diff --git a/1.txt b/1.txt
index e25b246..8e242c5 100644
--- a/1.txt
+++ b/1.txt
@@ -1,3 +1,7 @@
+<<<<<<< HEAD
 111
 222
-fenzhi2修改
\ No newline at end of file
+fenzhi2修改
+=======
+111
+>>>>>>> 1