Fix an error in Gemfile while merge conflicts