Retirement tax questions

In 2020, I took COVID qualified withdrawals of $38,000 and also received a payout from a company ESOP program, which I rolled over to the same plan, in the amount of $40,000. I filed my 2020 taxes thinking the rollover would qualify as repayment, but have now received a CP2000 notice stating I owe tax on the distribution (and hefty penalties). Am I right with my thinking or do I need to amend my return and pay tax on the withdrawal?