Cleanup bad merge.