diff --git a/冲突.txt b/冲突.txt
deleted file mode 100644
index d800886..0000000
--- a/冲突.txt
+++ /dev/null
@@ -1 +0,0 @@
-123
\ No newline at end of file