Merged changes into SCSS