change deploy method on staging
scm set to none for staging
fix merge conflict