gemfile + schema changes
merged