fix'd css merge