diff --git a/hello.txt b/hello.txt
index dfc1d88..87949fa 100644
--- a/hello.txt
+++ b/hello.txt
@@ -1,4 +1,9 @@
 hello lyy
 hello222
 
+<<<<<<< HEAD
 branch2修改
+branch2修改
+=======
+branch1修改
+>>>>>>> 4fb1465acd7b72ac470ae8307e4fbef0bf88df10
diff --git a/hello222.txt b/hello222.txt
new file mode 100644
index 0000000..f41a36a
--- /dev/null
+++ b/hello222.txt
@@ -0,0 +1,3 @@
+hello222
+
+添加一行-develop