fixed the conflict on style.css