diff --git a/src/test.txt b/src/test.txt
index cbc44858..565f1bab 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-修改里程碑筛选项
+合并冲突。