diff --git a/666.txt b/666.txt
index a884ab3..00307ee 100644
--- a/666.txt
+++ b/666.txt
@@ -4,3 +4,6 @@ disanhangceshi
 
 aasdasdasdas
 ceshi reset
+
+次分支修改，合并测试冲突
+