Both are included in D. The amount withheld for taxes and not converted to Roth will appear on Form 8606 line 7 while the converted amount will appear on 8. These will get summed on line 9 along with the year-end value on line 6.
