unify firearm services into 1