redo db migration, but zip shows up without migration
Fixed merge conflicts