changes to merged gemfile