1099R adds up 2020/2021 IRA contribution, causing over contribution in 2021

1st contribution - $7000 in May 2021( before 2020 file day), converted to Roth IRA, for 2020, but forgot submit 8606. 

2nd contribution - $7000 in June 2021, converted to Roth IRA, for 2021

 

1099 R shows 14000 distribution, without separating the two parts, resulting 2021 over contribution alert when I went through TT interview

 

1099R box 7 code is 7- normal distribution, should half of it be code R - 2020 distribution recharacterized in 2021? but TT and 1099 both treat it only one lump sum number for ALL 2020 contribution, 

 

how can I get this fixed?