Modifying gemfile
Completing merge