modify gemfile
merge conflict