models and associations
merge conflicts in gemfile
migrations, models and associations