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