diff --git a/src/test.txt b/src/test.txt
index c4c6913b..e135cb23 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge branch 'fix-2227' of https
\ No newline at end of file
+解决冲突