merge fix
gemfile
new bundle