Fix broken conflict merge.