Conflict Resolution and its Context