IRA backdoor conversion

I know there is a thread about backdoor conversion, but I need help for my specific situation.  We made a contribution of $6500 to a traditional IRA on 4/16/2018 for the 2017 tax year.  We made a $6500 contribution on 4/16/2018 to a traditional IRA also on 4/16/2018 for the 2018 tax year.  Total $13,000.  On 3/19/2019 these contributions were converted to a roth and I now have a 1099 R reporting distribution of $13,867.68.  Box 7 is marked "2", the box for IRA/SEP/Simple is marked with an X.    How in the heck do I report this on my 2019 tax return.  Do I need to make any kind of amendment to my 2018 return?