Fix what looks like a bad merge.