-create model and migrations
-seed data
fixed merge conflicts between branches