Fixed merge error

hyrax/app/helpers/hyrax_helper.rb

@@ -107,7 +107,6 @@ module HyraxHelper
     importer.entries.left_outer_joins(:latest_status).where('bulkrax_statuses.status_message IS NULL').count
   end
 
-<<<<<<< HEAD
   def sort_collections_docs_by_title(collections)
     sort_items_by_title(collections, :title_or_label)
   end
@@ -132,6 +131,7 @@ module HyraxHelper
     items.sort_by do |item|
       item.send(title_attribute).gsub(/[^a-zA-Z0-9]/, '0').split(/(\d+)/).map { |s| s.match(/\d+/) ? s.to_i : s }
     end
+  end
 
   def available_user_groups(ability:)
     return ::User.group_service.role_names if ability.admin?