Fixing merge issue with css map again.