Roth Excess Contributions for Tax Year 2020, Returned and Claimed in 2021 but Carrying Over Again in 2022 for 2021

In 2020 I made an excess Roth contribution.  I removed the contribution and created a manual 1099R to note the excess and paid the taxable amount with my 2020 return in 2021.  Today  I'm finalizing my 2021 taxes and Turbotax is adding form 5329 (I did not enter the information manually) in Section Part IV on lines 18-21.  Line 18 reads:   "Enter your excess contributions from line 24 of your 2020 Form 5329. See instructions. If zero, go to line 23". So it is saying I owe additional tax again Why is this happening? Note - I received a form 1099R for 2021 from my broker - but was not planning on entering anything (since I already included the information and paid the tax due last year).  Has anyone else come across this issue?