Situation: Working on conflict resolution