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