Yes, these should have been filed on separate tax returns, for separate years.
If you didn't file a return for 2017, you should file an original return for that year. If you filed a 2017 return, and didn't include all of your 2017 income, you should amend that return.
And, once your 2018 return has been processed by the IRS, you should amend that return to include only 2018 income information. However, the IRS may have problems processing the 2018 return because of the income from multiple years. If the IRS contacts you, follow any instructions that they provide. In the meantime, just wait and see what happens with the 2018 return before filing anything else.
Please see the
TurboTax FAQ "How to amend (change or correct) a return you already
filed," below, for instruction on how to amend your previously-filed tax
return.
https://ttlc.intuit.com/replies/3288565
