diff --git a/src/test.txt b/src/test.txt
index 93fcfb3a..059e2bf1 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-修改bug
+Merge remote-tracking branch 'origin/develop' into fix-1960