merge css fix