updated army class to handle conflicted resources