Undo master merge