You need to amend your 2016 tax return to included both 1099 R forms you have received. They both will be reported as non-taxable income. Most importantly, you will report to the IRS that the amounts were rolled over.
See the article below for instructions on how to amend a tax return you have already filed.
https://ttlc.intuit.com/questions/1894381-how-to-amend-change-or-correct-a-return-you-already-filed
