diff --git a/app/models/user.rb b/app/models/user.rb
index 0b37ac386..d415d7fcd 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,9 +1,5 @@
 class User < ActiveRecord::Base
-<<<<<<< HEAD
-  include ActsAsParanoidAliases
   include Verification
-=======
->>>>>>> master
 
   OMNIAUTH_EMAIL_PREFIX = 'omniauth@participacion'
   OMNIAUTH_EMAIL_REGEX  = /\A#{OMNIAUTH_EMAIL_PREFIX}/