For the Form 1099-R reporting the $25,000 converted to Roth, enter it only in the Form 1099-R entry section, indicate that it was moved to another retirement account and indicate the amount converted to Roth. Do not enter it anywhere under Deductions & Credits; go back and remove it from there.
