fix conflicting css rules