diff --git a/2.txt b/2.txt
index 60fd41d..c8dcf6e 100644
--- a/2.txt
+++ b/2.txt
@@ -2,4 +2,11 @@
 456455
 789461665
 sssssssssss
-dddddd看见艰苦及
\ No newline at end of file
+<<<<<<< HEAD
+dddddd看见艰苦及
+=======
+<<<<<<< HEAD
+dddddd
+mmmmmmm
+llllllcccccyyyyyy
+>>>>>>> 01f56c54a3cf53e5310e607bafebedd526648daf