css update and merge