how to resolve a conflict