fixing merge conflicts tweaking routes, schema, and gemfile