resolve merge conflicts

pom.xml

@@ -34,7 +34,7 @@
         <docker.tag>${io.confluent.common-docker.version}-${docker.os_type}</docker.tag>
         <io.confluent.common-docker.version>8.0.0-0</io.confluent.common-docker.version>
         <!-- Versions-->
-        <ubi.image.version>8.10-1086</ubi.image.version>
+        <ubi.image.version>8.10-1154</ubi.image.version>
         <ubi9.image.version>9.5-1736404155</ubi9.image.version>
         <ubi.micro.image.version>8.10-13</ubi.micro.image.version>
         <!-- OpenSSL version that is FIPS compliant -->