diff --git a/冲突.txt b/冲突.txt
new file mode 100644
index 0000000..16f56d0
--- /dev/null
+++ b/冲突.txt
@@ -0,0 +1,3 @@
+11111
+22222
+lihaoyi
\ No newline at end of file