Clean up lack of merge on rename.