chore: Resolve merge conflicts

Author: lqiu96

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

@@ -10,7 +10,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-iam-parent</artifactId>
-    <version>1.50.2</version><!-- {x-version-update:proto-google-iam-v1:current} -->
+    <version>1.50.3-SNAPSHOT</version><!-- {x-version-update:proto-google-iam-v1:current} -->
   </parent>
   <dependencies>
     <dependency>
@@ -42,6 +42,7 @@
       <artifactId>guava</artifactId>
     </dependency>
   </dependencies>
+<<<<<<< HEAD
 
   <profiles>
     <profile>
@@ -66,4 +67,6 @@
       </plugin>
     </plugins>
   </build>
+=======
+>>>>>>> aa68664b5 (chore: Resolve merge conflicts)
 </project>

java-iam/pom.xml

@@ -54,6 +54,16 @@
         <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

@@ -10,7 +10,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-iam-parent</artifactId>
-    <version>1.50.2</version><!-- {x-version-update:proto-google-iam-v1:current} -->
+    <version>1.50.3-SNAPSHOT</version><!-- {x-version-update:proto-google-iam-v1:current} -->
   </parent>
   <dependencies>
     <dependency>
@@ -22,6 +22,13 @@
       <artifactId>proto-google-common-protos</artifactId>
     </dependency>
     <dependency>
+<<<<<<< HEAD
+=======
+      <groupId>com.google.api.grpc</groupId>
+      <artifactId>proto-google-iam-v1</artifactId>
+    </dependency>
+    <dependency>
+>>>>>>> aa68664b5 (chore: Resolve merge conflicts)
       <groupId>com.google.api</groupId>
       <artifactId>api-common</artifactId>
     </dependency>