Resolve app/models/user.rb

app/models/user.rb

@@ -21,11 +21,8 @@ class User < ActiveRecord::Base
   include WithUploads
   include OptionallySearch
   include FromUnion
-<<<<<<< HEAD
 
   prepend EE::User
-=======
->>>>>>> upstream/master
 
   DEFAULT_NOTIFICATION_LEVEL = :participating
 
@@ -367,13 +364,10 @@ class User < ActiveRecord::Base
       emails = emails.confirmed if confirmed
 
       from_union([users, emails])
-<<<<<<< HEAD
     end
 
     def existing_member?(email)
       User.where(email: email).any? || Email.where(email: email).any?
-=======
->>>>>>> upstream/master
     end
 
     def filter(filter_name)