diff --git a/冲突.txt b/冲突.txt
index e69de29..7f88605 100644
--- a/冲突.txt
+++ b/冲突.txt
@@ -0,0 +1 @@
+远程修改
\ No newline at end of file