css confilct fix