diff --git a/src/test.txt b/src/test.txt
index 7275c702..7f015b53 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-#1102 fix bug
+合并V20211228冲突