1099-R box 7 shows 8 & J. However, the excessive $ amount is added to total Roth IRA conversion, which increases AGI. How can I get it corrected AGI?

should I edit 1099-R or file 1040-X later?