Bill would combine two veterans services into one