Fix conflict in _custom.scss