fix: clean post-rebase merge artifacts

packages/adapter-utils/src/server-utils.ts

@@ -1421,10 +1421,6 @@ export async function runChildProcess(
               maybeArmTerminalResultCleanup();
               resumeReadable(readable);
             });
-            .finally(() => {
-              maybeArmTerminalResultCleanup();
-              resumeReadable(readable);
-            });
         });
 
         child.stderr?.on("data", (chunk: unknown) => {
@@ -1441,10 +1437,6 @@ export async function runChildProcess(
               maybeArmTerminalResultCleanup();
               resumeReadable(readable);
             });
-            .finally(() => {
-              maybeArmTerminalResultCleanup();
-              resumeReadable(readable);
-            });
         });
 
         const stdin = child.stdin;

server/src/__tests__/heartbeat-process-recovery.test.ts

@@ -997,7 +997,6 @@ describeEmbeddedPostgres("heartbeat orphaned process recovery", () => {
     expect(issue?.executionRunId).toBeNull();
   });
 
-<<<<<<< HEAD
   it("classifies actionable plan-only recovery and enqueues one liveness continuation", async () => {
     mockAdapterExecute.mockResolvedValueOnce({
       exitCode: 0,

server/src/services/heartbeat.ts

@@ -630,7 +630,6 @@ const heartbeatRunIssueSummaryColumns = {
 function appendExcerpt(prev: string, chunk: string) {
   return appendWithByteCap(prev, chunk, MAX_EXCERPT_BYTES);
 }
-}
 
 function truncateRunEventString(value: string) {
   if (value.length <= MAX_RUN_EVENT_PAYLOAD_STRING_CHARS) return value;