Resolve conflicts in app/models/note.rb

app/models/note.rb

@@ -41,23 +41,16 @@ class Note < ActiveRecord::Base
   alias_attribute :last_edited_at, :updated_at
   alias_attribute :last_edited_by, :updated_by
 
-  # Number of user visible references as generated by Banzai::ObjectRenderer
+  # Attribute containing rendered and redacted Markdown as generated by
+  # Banzai::ObjectRenderer.
   attr_accessor :redacted_note_html
 
-<<<<<<< HEAD
-  # Number of user visible references as generated by Banzai::ObjectRenderer
-=======
   # Total of all references as generated by Banzai::ObjectRenderer
   attr_accessor :total_reference_count
 
-  # An Array containing the number of visible references as generated by
-  # Banzai::ObjectRenderer
->>>>>>> upstream/master
+  # Number of user visible references as generated by Banzai::ObjectRenderer
   attr_accessor :user_visible_reference_count
 
-  # Total of all references as generated by Banzai::ObjectRenderer
-  attr_accessor :total_reference_count
-
   # Attribute used to store the attributes that have been changed by quick actions.
   attr_accessor :commands_changes