migration and database set-up, but DAFUQ?
merge conflicts resolved