fixed conflict in custom.css