updated the stylesheet conflicts