resolving conflic