Conflict and Resolution – Workshop Outline