resolve confilicts

Makefile

 crontab:
 	cp crontab.py  /data/log/physical/app/crontab.py && python /data/log/physical/app/crontab.py && python  /data/log/physical/app/crontabs.py
+celery:
+	celery -A physcical worker -c 1 -Q vest -l debug

README.md

@@ -55,10 +55,4 @@ celery -A physical beat
 
 ### physical策略端脚本
 在Alp-Test-Cos-test001服务器上，通过crontab -l查看
-<<<<<<< README.md
-
-更新脚本
-```bash
-make crontab
-```
 

physical/celery_task_router.py

@@ -9,12 +9,14 @@ class CeleryTaskRouter(object):
     queue_task_map = {
         "tapir-alpha": [
             'injection.data_sync.tasks.write_to_es',
+        ],
+        "vest": [
             'vest.request.auto_request.click',
             'vest.request.auto_request.reply',
             'vest.request.auto_request.follow',
             'vest.request.auto_request.reply2',
             'vest.request.auto_request.pictorial_reply'
-        ],
+        ]
     }
 
     # Map[TaskName, QueueName]