reset style.css
merge conflift