I received a 2018 1099-R for a 2017 Roth distribution.Taxable amount $.06 Box 7 code P, but in TT 2017 that code indicates 2016 distribution, so I can’t properly amend.

Box 7 code P on the 2018 form (indicating a 2017 taxable distribution)  resulted in TT 2018 saying I needed to amend my 2017 return.  However, in TT 2017, when I go to add a 1099-R, code P indicates a 2016 distrubution.  So TT 2018 won’t allow me to add the 1099-R, and TT 2017 with code P indicates an incorrect 2016 distribution.