diff --git a/src/test.txt b/src/test.txt
index e135cb23..a2671b4f 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-解决冲突
+Merge branch 'V20220630' into fix-2227