resolve confict