resolve confilt