1099r for BOTH 2019 and 2020 contributions triggers tax

Changing the $14,000 to $7,000 alleviates the tax entirely (as it should).   I can't be the only one who made a contribution to my nondeductible for a backdoor conversion to Roth in early 2020 for BOTH calendar year 2019 AND 2020? Unfortunately for me, I made both contributions in early 2020 so the 1099r was generated for both in the same calendar year and I cannot figure out how I handle that in TT without creating a $400 tax on the dollars when combined.