Updated gems
fixing Gemfile.lock merge conflicts