diff --git a/src/test.txt b/src/test.txt
index e135cb23..563978f9 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-解决冲突
+Merge branch 'zouap_static' of git.openi.org.cn:OpenI/aiforge into zouap_static