Update gemfile
Update gemfile, fix merge conflicts