Chapter 561: Resolving Conflict