adjustments scss core
conflict ok