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