diff --git a/test_1.txt b/test_1.txt
index 633a8e3..6f01d44 100644
--- a/test_1.txt
+++ b/test_1.txt
@@ -1,2 +1,3 @@
-dadsad
-wangbo修改的冲突代码
\ No newline at end of file
+sya修改的冲突代码
+wangbo修改的冲突代码
+