diff --git a/test_1.txt b/test_1.txt
index 3a5ab04..6f01d44 100644
--- a/test_1.txt
+++ b/test_1.txt
@@ -1,2 +1,3 @@
 sya修改的冲突代码
-dsdsad
\ No newline at end of file
+wangbo修改的冲突代码
+
diff --git a/test_3.txt b/test_3.txt
index ffefe84..71adaea 100644
--- a/test_3.txt
+++ b/test_3.txt
@@ -1,2 +1,6 @@
+
 dadsad
-dsdsad
\ No newline at end of file
+dsdsadxxod
+
+孙浩冲突
+何