diff --git a/src/test.txt b/src/test.txt
index 40581d83..e29df0ba 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-合并最新代码，并解决冲突。
+fix-bug