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