Fix merge conflict marker left behind from a rebase.