Feature/sass merge