resolve conflit css