deploy to production from staging
Merge branch 'master' into staging
removed merge option from deploy task