diff --git a/1.txt b/1.txt
index 2a5f186..188aaf1 100644
--- a/1.txt
+++ b/1.txt
@@ -2,4 +2,5 @@
 222
 添加内容
 丢弃内容
-修改内容
\ No newline at end of file
+修改内容
+与本地冲突
\ No newline at end of file