diff --git a/ui/src/components/IssueChatThread.test.tsx b/ui/src/components/IssueChatThread.test.tsx
index bf4d34c32bf..920eba15c22 100644
--- a/ui/src/components/IssueChatThread.test.tsx
+++ b/ui/src/components/IssueChatThread.test.tsx
@@ -881,8 +881,6 @@ describe("IssueChatThread", () => {
 
     const spacer = container.querySelector('[data-testid="issue-chat-bottom-spacer"]');
     expect(spacer).toBeNull();
-=======
->>>>>>> Tune floating reply composer padding, offset, and initial height
 
     act(() => {
       root.unmount();
diff --git a/ui/src/components/IssueChatThread.tsx b/ui/src/components/IssueChatThread.tsx
index e7e2d34af9f..c3ab976d5dd 100644
--- a/ui/src/components/IssueChatThread.tsx
+++ b/ui/src/components/IssueChatThread.tsx
@@ -2555,7 +2555,6 @@ export function IssueChatThread({
       spacerInitialReserveRef.current = 0;
     }
   }, [messages]);
-
   useLayoutEffect(() => {
     const composerElement = composerViewportAnchorRef.current;
     if (preserveComposerViewportRef.current) {