
          Conflict resolution

1726e10