Need to Correct FSA and HSA contribution in 2020

I just found out my wife contributed $2,700 FSA in 2020 and I also contributed $7,100 HSA in 2020. My wife and I had high deductible family health insurance from Mar 2020 to Dec 2020 (due to my job change). She had her own insurance from her workplace and I had my own insurance from my old workplace from Jan to Feb 2020. My questions are:

1. How to correct this in the tax return?

2. Ideally I would like to keep the HSA contribution and correct the FSA contribution, is this possible? 

Thanks for your help. 

Best,

Ying