You should have two separate 1099-Rs, yes? The broker should issue corrected 1099-Rs that correctly report the rollovers.
