resolve merge

Author: jeanetteclark

pom.xml

@@ -164,7 +164,7 @@
     <dependency>
       <groupId>org.apache.solr</groupId>
       <artifactId>solr-solrj</artifactId>
-      <version>8.11.1</version>
+      <version>9.6.0</version>
       <exclusions>
         <exclusion>
           <groupId>junit</groupId>