diff --git a/src/test.txt b/src/test.txt
index e135cb23..d8434b35 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-解决冲突
+Merge pull request 'V20220718.patch 云脑二专属资源池' (#2581) from V20220718.patch into develop