Resolve notes conflicts

app/models/note.rb

@@ -160,13 +160,10 @@ class Note < ActiveRecord::Base
     def has_special_role?(role, note)
       note.special_role == role
     end
-<<<<<<< HEAD
   end
 
   def searchable?
     !system
-=======
->>>>>>> upstream/master
   end
 
   def cross_reference?