Fix merge error in Gemfile.