Fixing bad merge.
Fixed merge