chore: Resolve merge conflicts

Author: lqiu96

.kokoro/build.sh

@@ -63,7 +63,7 @@ javadoc)
 integration)
     mvn -B ${INTEGRATION_TEST_ARGS} \
       -ntp \
-      -Dprotobuf.version=4.29.3 \
+      -Dprotobuf.version=4.31.0-RC131.0-RC131.0-RC131.0-RC131.0-RC131.0-RC131.0-RC131.0-RC131.0-RC131.0-RC131.0-RC131.0-RC131.0-RC131.0-RC131.0-RC131.0-RC131.0-RC131.0-RC131.0-RC131.0-RC131.0-RC131.0-RC131.0-RC131.0-RC131.0-RC131.0-RC131.0-RC131.0-RC131.0-RC131.0-RC131.0-RC1 \
       -Penable-integration-tests \
       -DtrimStackTrace=false \
       -Dclirr.skip=true \