On the 2020 return you will ONLY report the non deductible 2020 contribution on the form 8606 ... then on the 2021 return you will report the conversion when the 1099-R form is sent next January.
