Fix Gemfile after rebase