resolved css conflicts