Chapter 279: Conflict Resolved