The New Politics of Conflict Resolution: Responding to Difference