updates gemfile and database
fixed merge conflicts