The Resolution of Conflict