From 15a1783d2e1a748875c1535591d85c74032ac579 Mon Sep 17 00:00:00 2001
From: Dave <futurechimp@users.noreply.github.com>
Date: Fri, 27 Feb 2026 11:24:46 +0000
Subject: [PATCH] Fix syntax error in StagePanel.tsx from merge conflict
 artifact

Remove duplicate inline-style JSX block that was left behind after a
merge, causing esbuild parse errors. Restore hasMergeFailure border and
background colors in the cardStyle object.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 frontend/src/components/StagePanel.tsx | 34 ++++++++------------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/frontend/src/components/StagePanel.tsx b/frontend/src/components/StagePanel.tsx
index 0c3e8a8..726751a 100644
--- a/frontend/src/components/StagePanel.tsx
+++ b/frontend/src/components/StagePanel.tsx
@@ -169,33 +169,19 @@ export function StagePanel({
 						const borderColor = TYPE_COLORS[itemType];
 						const typeLabel = TYPE_LABELS[itemType];
 						const hasMergeFailure = Boolean(item.merge_failure);
-						return (
-							<div
-								key={`${title}-${item.story_id}`}
-								data-testid={`card-${item.story_id}`}
-								style={{
-									border: hasMergeFailure
-										? "1px solid #6e1b1b"
-										: item.agent
-											? "1px solid #2a3a4a"
-											: "1px solid #2a2a2a",
-									borderRadius: "8px",
-									padding: "8px 12px",
-									background: hasMergeFailure
-										? "#1f1010"
-										: item.agent
-											? "#161e2a"
-											: "#191919",
-									display: "flex",
-									flexDirection: "column",
-									gap: "2px",
-								}}
-							>
 						const cardStyle = {
-							border: item.agent ? "1px solid #2a3a4a" : "1px solid #2a2a2a",
+							border: hasMergeFailure
+								? "1px solid #6e1b1b"
+								: item.agent
+									? "1px solid #2a3a4a"
+									: "1px solid #2a2a2a",
 							borderRadius: "8px",
 							padding: "8px 12px",
-							background: item.agent ? "#161e2a" : "#191919",
+							background: hasMergeFailure
+								? "#1f1010"
+								: item.agent
+									? "#161e2a"
+									: "#191919",
 							display: "flex",
 							flexDirection: "column" as const,
 							gap: "2px",