Attempt to resolve the conflict........