deploy task now working as expected
fixed merge conflicts