resolve confliect