Resolve conflict in custom.css