merge in gemfile