remove conflict marker from rebase