Conflict resolution (detail), 2017