Conflict resolution Conference 2024