Cleaned up rebase/merge artifact.