Reset to upstream master instead of rebasing during deployment