After you file

You must amend both your 2016 and 2017 tax returns.

The contribution for 2016 was reportable on your 2016 tax return.  Was the contribution for 2016 a deductible or a nondeductible traditional IRA contribution?