Update Gemfile

* bugged merge