solve css conflicts