fixed my gemfile, hope it doesn't break yours
fixing conflicts in db/schema, Gemfile.lock