Hi Sandro,
I don't know if it's not better just to start over, because I'm wasting
your time and it's not even a production environment. Maybe it's better
just to cleanup everything and start over.
Other idea I had is to cleanup the database and then import the backup
that the upgrade made before rolling back. I don't know if that can lead
to an inconsistent database or not.
Regards,