Fix CSS merges