diff --git a/app/models/profile.rb b/app/models/profile.rb
index c6805c2..93cb98d 100644
--- a/app/models/profile.rb
+++ b/app/models/profile.rb
@@ -100,12 +100,12 @@ class Profile < ActiveRecord::Base
   scope :no_templates, {:conditions => {:is_template => false}}
 
   #FIXME make this test
-  named_scope :newer_than, lambda { |reference_id|
+  scope :newer_than, lambda { |reference_id|
     {:conditions => ["profiles.id > #{reference_id}"]}
   }
 
   #FIXME make this test
-  named_scope :older_than, lambda { |reference_id|
+  scope :older_than, lambda { |reference_id|
     {:conditions => ["profiles.id < #{reference_id}"]}
   }
 
diff --git a/test/unit/person_test.rb b/test/unit/person_test.rb
index 3603a72..dcc57d3 100644
--- a/test/unit/person_test.rb
+++ b/test/unit/person_test.rb
@@ -1524,7 +1524,6 @@ class PersonTest < ActiveSupport::TestCase
     end
   end
 
-<<<<<<< HEAD
   should 'have a list of suggested people to be friend' do
     person = create_user('person').person
     suggested_friend = fast_create(Person)
--
libgit2 0.21.2