The Joy of Conflict Resolution