Fixing Gemfile after git merge testing