Remove missed merge conflict from rebase.