modified gemfile
fixed merge