resolving conflit