From 35d4fe8a8cc2637371909706c3c0f32495ee81c8 Mon Sep 17 00:00:00 2001
From: jmaeagle99 <44687433+jmaeagle99@users.noreply.github.com>
Date: Wed, 27 May 2026 15:36:08 -0700
Subject: [PATCH 1/2] Upgrade temporal-api to v1.62.12

---
 temporal-serviceclient/src/main/proto | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/temporal-serviceclient/src/main/proto b/temporal-serviceclient/src/main/proto
index 67150b14e..d2fc34ab8 160000
--- a/temporal-serviceclient/src/main/proto
+++ b/temporal-serviceclient/src/main/proto
@@ -1 +1 @@
-Subproject commit 67150b14e0509210bf250960bd3278a4509e091c
+Subproject commit d2fc34ab844603f50e41365f46c7fb82bdedffe6

From f14e8cae6f0b6c5f29b065fcddb6d9099d854e92 Mon Sep 17 00:00:00 2001
From: jmaeagle99 <44687433+jmaeagle99@users.noreply.github.com>
Date: Wed, 27 May 2026 15:42:26 -0700
Subject: [PATCH 2/2] Disambiguate OnConflictOptions

---
 .../internal/testservice/TestWorkflowMutableStateImpl.java       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/temporal-test-server/src/main/java/io/temporal/internal/testservice/TestWorkflowMutableStateImpl.java b/temporal-test-server/src/main/java/io/temporal/internal/testservice/TestWorkflowMutableStateImpl.java
index a1cf4e111..f28075db6 100644
--- a/temporal-test-server/src/main/java/io/temporal/internal/testservice/TestWorkflowMutableStateImpl.java
+++ b/temporal-test-server/src/main/java/io/temporal/internal/testservice/TestWorkflowMutableStateImpl.java
@@ -37,6 +37,7 @@
 import io.temporal.api.taskqueue.v1.StickyExecutionAttributes;
 import io.temporal.api.update.v1.*;
 import io.temporal.api.workflow.v1.*;
+import io.temporal.api.workflow.v1.OnConflictOptions;
 import io.temporal.api.workflowservice.v1.*;
 import io.temporal.common.converter.DefaultDataConverter;
 import io.temporal.failure.ServerFailure;