fixed merge issue with css