chore: Resolve merge conflicts

Author: lqiu96

java-iam/grpc-google-iam-v3/pom.xml

@@ -43,6 +43,9 @@
     </dependency>
   </dependencies>
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> e30992350 (chore: Resolve pom issues in IAM v3 generation)
 
   <profiles>
     <profile>
@@ -67,6 +70,9 @@
       </plugin>
     </plugins>
   </build>
+<<<<<<< HEAD
 =======
 >>>>>>> aa68664b5 (chore: Resolve merge conflicts)
+=======
+>>>>>>> e30992350 (chore: Resolve pom issues in IAM v3 generation)
 </project>

java-iam/pom.xml

@@ -54,16 +54,6 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-      <dependency>
-        <groupId>com.google.api.grpc.api.grpc</groupId>
-        <artifactId>proto-google-iam-v3</artifactId>
-        <version>1.50.2</version><!-- {x-version-update:proto-google-iam-v3:current} -->
-      </dependency>
-      <dependency>
-        <groupId>com.google.api.grpc.api.grpc</groupId>
-        <artifactId>grpc-google-iam-v3</artifactId>
-        <version>1.50.2</version><!-- {x-version-update:grpc-google-iam-v3:current} -->
-      </dependency>
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava-bom</artifactId>

java-iam/proto-google-iam-v3/pom.xml

@@ -23,12 +23,15 @@
     </dependency>
     <dependency>
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
       <groupId>com.google.api.grpc</groupId>
       <artifactId>proto-google-iam-v1</artifactId>
     </dependency>
     <dependency>
 >>>>>>> aa68664b5 (chore: Resolve merge conflicts)
+=======
+>>>>>>> e30992350 (chore: Resolve pom issues in IAM v3 generation)
       <groupId>com.google.api</groupId>
       <artifactId>api-common</artifactId>
     </dependency>