Fix CSS merge issue