resolve conflicts

Author: lizk886

pom.xml

@@ -6,11 +6,7 @@
 
     <groupId>com.uid2</groupId>
     <artifactId>uid2-operator</artifactId>
-<<<<<<< HEAD
     <version>5.58.24</version>
-=======
-    <version>5.58.18-alpha-219-SNAPSHOT</version>
->>>>>>> 1c9e1859a26788168b7a3c8bd836620815b4a087
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -26,11 +22,7 @@
         <enclave-aws.version>2.1.0</enclave-aws.version>
         <enclave-azure.version>2.1.13</enclave-azure.version>
         <enclave-gcp.version>2.1.0</enclave-gcp.version>
-<<<<<<< HEAD
-        <uid2-shared.version>11.1.13</uid2-shared.version>
-=======
         <uid2-shared.version>11.1.3-alpha-297-SNAPSHOT</uid2-shared.version>
->>>>>>> 1c9e1859a26788168b7a3c8bd836620815b4a087
         <image.version>${project.version}</image.version>
         <maven.compiler.source>21</maven.compiler.source>
         <maven.compiler.target>21</maven.compiler.target>