Fix merge conflict in Gemfile