Resolve confict