diff --git a/src/test.txt b/src/test.txt
index e06281a8..e135cb23 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-修复card结束标签
+解决冲突