diff --git a/.gitignore b/.gitignore
index a66fbe0..d3cf9bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
 需要忽略.txt
+<<<<<<< HEAD
 停止跟踪.txt
+=======
+>>>>>>> no message