fixed conflict in style.css