alphabetize css
fix merge