Fixed style.scss and style.css after merging.