1,232. Conflict resolution