Fix compile issues with bad merge.