diff --git a/docs/6-2-1dingtalk.md b/docs/6-2-1dingtalk.md
index 0f0f26a..717234f 100644
--- a/docs/6-2-1dingtalk.md
+++ b/docs/6-2-1dingtalk.md
@@ -2,11 +2,8 @@
 
 > 添加钉钉机器人
 
-<<<<<<< HEAD
 1. ###### 进入钉钉群，点击设置选，选择添加群助手
-=======
-1. ###### 添加群助手
->>>>>>> d037af8d861e44b1cd013c5f68e81da352b68fad
+
 
 <img src="http://img.threatbook.cn/hfish/image-20210803203953937.png" alt="image-20210803203953937" style="zoom: 50%;" />