diff --git a/frontend/src/components/Chat.test.tsx b/frontend/src/components/Chat.test.tsx
index 0938ad2..7d11c99 100644
--- a/frontend/src/components/Chat.test.tsx
+++ b/frontend/src/components/Chat.test.tsx
@@ -766,7 +766,6 @@ describe("Chat message rendering — unified tool call UI", () => {
 			capturedWsHandlers?.onUpdate(messages);
 		});
 
-<<<<<<< HEAD
 		expect(await screen.findByText("Bash(cargo test)")).toBeInTheDocument();
 		expect(await screen.findByText("Read(Cargo.toml)")).toBeInTheDocument();
 	});
@@ -855,6 +854,5 @@ describe("Chat two-column layout", () => {
 			configurable: true,
 			value: 1024,
 		});
->>>>>>> 222b581 (Story 48: Two Column Layout — Chat Left, Panels Right)
 	});
 });