Remove conflict in controller

app/controllers/catalog_controller.rb

@@ -89,12 +89,10 @@ def self.uploaded_field
     config.default_solr_params = {
       qt: "search",
       rows: 10,
-<<<<<<< HEAD
-      qf: IiifPrint.config.metadata_fields.keys.map { |attribute| "#{attribute}_tesim" }
-                   .join(' ') << " title_tesim description_tesim all_text_timv file_set_text_tsimv", # the first space character is necessary!
-=======
-      qf: "title_tesim alternative_title_tesim description_tesim creator_tesim contributor_tesim related_url_tesim learning_resource_type_tesim education_level_tesim audience_tesim degree_name_tesim degree_discipline_tesim degree_grantor_tesim date_tesim table_of_contents_tesim rights_statement_tesim license_tesim rights_holder_tesim publisher_tesim identifier_tesim keyword_tesim subject_tesim language_tesim resource_type_tesim date_created_tesim date_uploaded_tesim date_modified_tesim accessibility_feature_tesim accessibility_hazard_tesim accessibility_summary_tesim format_tesim extent_tesim all_text_timv",
->>>>>>> pals-contribute-back-to-prime
+      qf: (
+        IiifPrint.config.metadata_fields.keys.map { |attribute| "#{attribute}_tesim" } +
+        ["title_tesim", "description_tesim", "all_text_timv", "file_set_text_tsimv"]
+      ).join(' '),
       "hl": true,
       "hl.simple.pre": "<span class='highlight'>",
       "hl.simple.post": "</span>",

config/routes.rb

@@ -78,11 +78,7 @@
   mount Qa::Engine => '/authorities'
 
   mount Blacklight::Engine => '/'
-<<<<<<< HEAD
   mount BlacklightAdvancedSearch::Engine => '/'
-=======
-
->>>>>>> pals-contribute-back-to-prime
   mount Hyrax::Engine, at: '/'
   mount Bulkrax::Engine, at: '/' if ENV.fetch('HYKU_BULKRAX_ENABLED', 'true') == 'true'
   mount HykuKnapsack::Engine, at: '/'