fix css merge