migrations and models created, and seed file ran successfully
conflicts resolved
merge conflicts resolved