- resolve conflic