fixed merge conflict
Gemfile mods