The amended return should take care of the 6% penalty for the excess contribution.
In order to determine the taxability of the distribution in 2021 google " A comprehensive guide to tax treatments of Roth IRA distributions"
