fixed scss helper merge