Feature/sass merge2