Fix the fallout of the merge.