fix sass conflicts