Resolve confic