diff --git a/README.md b/README.md
index c3a3db3..637fbbb 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,7 @@
+<<<<<<< HEAD
 采集任务管理应用
+=======
+# crawltaskmanager
+
+网站数据采集应用管理
+>>>>>>> branch 'master' of http://82.156.111.58:3000/maojian/crawltaskmanager.git