Cleaning up bad merge.