Fix bad merge.