fixed remaining merge conflicts in db-schema and gemfile