added .crx  to deploy-task
fixed merge conflicts