diff --git a/666.txt b/666.txt
index d8ba862..968acd1 100644
--- a/666.txt
+++ b/666.txt
@@ -1,3 +1,5 @@
 hello world
 hello world
 disanhangceshi
+
+次分支修改，合并测试冲突