diff --git a/文档/tow.txt b/文档/tow.txt
index aa1259c..cdccf8b 100644
--- a/文档/tow.txt
+++ b/文档/tow.txt
@@ -1,5 +1,9 @@
 123
 
+<<<<<<< HEAD
+466123123123
+=======
 466
 
 566
+>>>>>>> luo