modified gemfile
merge