More merge fixes for Gemfile