diff --git a/frontend/src/components/AgentPanel.test.tsx b/frontend/src/components/AgentPanel.test.tsx
index 8dd10b5..dd156e6 100644
--- a/frontend/src/components/AgentPanel.test.tsx
+++ b/frontend/src/components/AgentPanel.test.tsx
@@ -66,7 +66,6 @@ describe("AgentPanel active work list removed", () => {
 		expect(
 			container.querySelector('[data-testid^="agent-entry-"]'),
 		).not.toBeInTheDocument();
-<<<<<<< HEAD
 	});
 });