changes to sass
merged