Fix broken merge.