got rid of conflict in css