diff --git a/src/test.txt b/src/test.txt
index 576c0d80..4b54c38f 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge pull request 'fix-2477' (#2568) from fix-2477 into V20220801
+冲突