diff --git a/冲突.txt b/冲突.txt
new file mode 100644
index 0000000..1be6e43
--- /dev/null
+++ b/冲突.txt
@@ -0,0 +1,3 @@
+111111
+222222
+main
\ No newline at end of file