Fixed merge conflicts

* Fixed merge conflicts on Gemfile