Resolving confict.