You have a mess ... again you will need to start the 2017 return all over again and transfer in the 2016 info if it is needed then recreate the 2017 return AS FILED originally. Only when the return looks exactly like how it was filed can you amend the return to make the corrections. If this is too much for you to do then seek assistance from a friend or local professionals.
