Fix css merge

Merging for friday