tryed to resolve the conflict