diff --git a/conflict.txt b/conflict.txt
new file mode 100644
index 0000000..cd24ed3
--- /dev/null
+++ b/conflict.txt
@@ -0,0 +1,2 @@
+这是fenzhi4分支的内容
+第二行内容
\ No newline at end of file