diff --git a/src/test.txt b/src/test.txt
index b8b0d68e..e7bb6761 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-合并分支，解决冲突。
+fix issue