Resolve app/models/identity.rb

app/models/identity.rb

 class Identity < ActiveRecord::Base
-<<<<<<< HEAD
   prepend EE::Identity
-=======
+
   def self.uniqueness_scope
     :provider
   end
->>>>>>> upstream/master
 
   include Sortable
   include CaseSensitivity