Fixing css merge