conflict style.css fix