switching to pub build deploys
resolve merge conflicts