Add bundler gem
Fix merge conflict bug