Retirement tax questions

Thank you. Given that, just want to make sure I understand completely. 2024 non deductible contribution is accounted for, that money was converted in 2025. If I also fund contributory now (which will also be non deductible) for 2025, and subsequently convert that in a week, the 1099-r for 2025 will show both conversions. On 2025 return, I report the income for both, and then can “offset” both with the basis on file 2024 and in current year 2025 l. That sound right? TYVM