diff --git a/conflict_demo.txt b/conflict_demo.txt
index 753db7a..f43c0db 100644
--- a/conflict_demo.txt
+++ b/conflict_demo.txt
@@ -1 +1 @@
-这是akun修改的内容
+这是akun修改的冲突行