Fixing bad merge.