You filed correctly for 2017 and do not need to amend your 2017 return.
For this year, you only report the gain on your 2018 tax return as you have already reported the excess contribution in 2017.
**Say "Thanks" by clicking the thumb icon in a post
**Mark the post that answers your question by clicking on "Mark as Best Answer"
