fix conflict

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
-<<<<<<< HEAD
-
-=======
->>>>>>> fe8ae25876e5baba8581e3a79f5440c3f7f21dca
 celery:
-	celery -A physical worker -c 1 -Q tapir-alpha -l debug --max-tasks-per-child == 500
+	celery -A physical worker -c 1 -Q vest -l debug

README.md

@@ -56,10 +56,7 @@ celery -A physical beat
 ### physical策略端脚本
 在Alp-Test-Cos-test001服务器上，通过crontab -l查看
 
-<<<<<<< HEAD
 更新脚本
 ```bash
 make crontab
 ```
-=======
->>>>>>> fe8ae25876e5baba8581e3a79f5440c3f7f21dca