@angela829 if you amended 2024 I don't know the "merge" you're referring to but I think you should just have to update the question on your carryover basis in the Trad IRA section to make sure Line 2 on Form 8606 is correct. If on desktop you can double-click on the Form 8606 lines in Forms mode and/or check the IRA Information Worksheet.
Then for 2025 if Line 6/7 are still blank you should go back through the box inputs and questions on the 1099-R. If still having issues can you post more details on what's on your 1099-R then maybe someone here will be able to advise further.
