military conflict resolution