resolve conflic sample