diff --git a/src/components/chat-components/ChatSingleMessage.test.tsx b/src/components/chat-components/ChatSingleMessage.test.tsx
index 36aa5586..473e6692 100644
--- a/src/components/chat-components/ChatSingleMessage.test.tsx
+++ b/src/components/chat-components/ChatSingleMessage.test.tsx
@@ -269,11 +269,7 @@ describe("ChatSingleMessage", () => {
   });
 
   beforeAll(() => {
-<<<<<<< HEAD
     (window as any).activeDocument = window.document;
-=======
-    (window as any).activeDocument = document;
->>>>>>> 267bf91 (chore(popout): window-global API swaps — timers, globalThis, base64 (W3/9))
   });
 
   it("normalizes rendered footnotes for assistant messages", async () => {