Conflict Resoultion in DEI