resolved css confilct