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