Mitigating Conflict Types