updated conflicting styles