diff --git a/README.md b/README.md
index 7c67fd0..332fb76 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,7 @@
+<<<<<<< HEAD
 分析助手应用调度
+=======
+# analyst_assistant_schedule
+
+有知数据流调度
+>>>>>>> branch 'master' of http://82.156.111.58:3000/maojian/analyst_assistant_schedule.git