reset the branch before running the accept theirs merge command