diff --git a/conflict_demo.txt b/conflict_demo.txt
index f43c0db..88daadf 100644
--- a/conflict_demo.txt
+++ b/conflict_demo.txt
@@ -1 +1 @@
-这是akun修改的冲突行
+这是李四修改的冲突行