HSA overcontribution 2021

I did a one time IRA direct rollover from my IRA to HSA in 2021 of $8200 that turned out was ineligible.  So I did an indirect return of the overcontribution back to the IRA in 2021.   I received a 1099-R of the IRA direct rollover into the HSA coded as G - Direct rollover and rollover  contribution and a 1099-SA for the return of the HSA amount coded as 2 - excess contribution which was a check into my account. I then deposited the exact amount back into the original IRA.    How do I enter these into turbotax desktop? 

 

For the 1099-R,  I chose in turbotax that the money was put into an HSA.  Then under less common income, I included the 1099-SA amount.  Turbotax says that I made an excess HSA contribution of 7867 (8200 - 233) and asks if I will withdraw the 7867 by April 18, 2022.  When I try to enter that I withdrew 8200, turboxtax says it is too large.  I also enter the 8200 as a IRA contribution (return back into the original IRA) and turbotax says I made an excess contribution of $1200 and owe a penalty.  I am very confused. 

 

Help greatly appreciated!

 

What am I doing wrong????  I dont see why I made an overcontribution since I already