i don't know what "lump together" even means since they are different events.
your conversion is taxable so if you added a contribution into that amount you are paying more tax than you should be, or, your original return was not correct.
