Resolved conflict "style.css"