Fix weird merge.