making army button
fixed merge