conflict mitigation