International conflict resolution