7.4: Conflict Management