Fix incorrect merge.