merge css changes