resolving confict