fixing style.css
merging