Retirement tax questions

I took my RMD early in 2020 and paid Federal and State Taxes on the distribution.  After the Care Act, I returned the RMD back to the IRA and converted the same amount to my Roth IRA.  Since taxes were already paid on the RMD I did not apply for any refund and just left them alone.  

 

When I got my 1099-R from the bank, I tried to enter it into Turbo Tax Premier with the above data and got a message back that  could not do this with one 1099-R.  I would have to delete the 1099-R from the bank and enter two new RMD's manually (the back refuses to issue new 1099-R's)  I deleted the bank's 1099-R, added two new 1099-R's and added an explanation as to what happened.  I expect this is going to trigger a letter from the IRS and/or other problems.  Is Turbo Tax going to update the software to handle this or is there another solution?

 

Thanks

mclewi2000