fixed merge css