diff --git a/app/models/user.rb b/app/models/user.rb
index f23956f1438689645c497338bbbe29d2229b28d6..8e8b476eb11fb6d97a4797b39da91f98282be5d8 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -87,13 +87,11 @@ class User < ActiveRecord::Base
     false
   end
 
-<<<<<<< HEAD
   def associated_collections
     c = collections.blank? ? [] : collections.includes(:owner)
     c + Collection.where(owner: institutions).includes(:owner)
   end
 
-=======
   # ~~~~ followable actions ~~~~ #
   # An user can follow anothers users and collections
   # Examples:
@@ -119,7 +117,6 @@ class User < ActiveRecord::Base
   end
   # ~~~~ end followable actions ~~~~ #
 
->>>>>>> railsapi
   private
 
   def default_role