Fixing a Gemfile error in last merge