Fix custom.css conflict