remove an accidental merge using a rebase
replacing one branch with the contents of another