Added military conflict resolution logic.
Removed commented-out code.