diff --git a/branch1.txt b/branch1.txt
index f6251a7..6321a6a 100644
--- a/branch1.txt
+++ b/branch1.txt
@@ -1,2 +1,6 @@
 branch1
+<<<<<<< HEAD
 master1
+=======
+第二次修改branch1
+>>>>>>> branch1