fixed conflict in css