update deploy.md
resolve conflict