diff --git a/conflict_demo.txt b/conflict_demo.txt
new file mode 100644
index 0000000..753db7a
--- /dev/null
+++ b/conflict_demo.txt
@@ -0,0 +1 @@
+这是akun修改的内容