diff --git a/src/test.txt b/src/test.txt
index 3422e3b0..e135cb23 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge branch 'V20220830' into fix-2626
+解决冲突