updates to deploy script
fixed merge conflicts