diff --git a/apps/web/src/components/ui/inputs/InputTextArea.tsx b/apps/web/src/components/ui/inputs/InputTextArea.tsx
index 47ff0e5b2..069cb3e3b 100644
--- a/apps/web/src/components/ui/inputs/InputTextArea.tsx
+++ b/apps/web/src/components/ui/inputs/InputTextArea.tsx
@@ -48,11 +48,7 @@ export const InputTextArea = React.forwardRef<InputTextAreaRef, InputTextAreaPro
   ) => {
     const textareaRef = useRef<HTMLTextAreaElement | null>(null);
 
-    <<<<<<< HEAD
-    useImperativeHandle(
-      ref,
-      () =>
-    {
+    useImperativeHandle(ref, () => {
       if (!textareaRef.current) {
         return null as unknown as InputTextAreaRef;
       }
@@ -65,28 +61,7 @@ export const InputTextArea = React.forwardRef<InputTextAreaRef, InputTextAreaPro
           }
         },
       });
-    }
-    ,
-      []
-    )
-    =======
-    useImperativeHandle(ref, () =>
-    {
-      if (!textareaRef.current) {
-        return null as unknown as InputTextAreaRef;
-      }
-      return Object.assign(textareaRef.current, {
-        forceRecalculateHeight: () => {
-          if (textareaRef.current) {
-            // Force a recalculation by triggering an input event
-            const event = new Event('input', { bubbles: true });
-            textareaRef.current.dispatchEvent(event);
-          }
-        },
-      });
-    }
-    , [])
-    >>>>>>> staging
+    }, []);
 
     const handleKeyDown = (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
       if (e.key === 'Enter') {
@@ -119,4 +94,4 @@ export const InputTextArea = React.forwardRef<InputTextAreaRef, InputTextAreaPro
   }
 );
 
-InputTextArea.displayName = 'InputTextArea';
+InputTextArea.displayName = 'InputTextArea';
\ No newline at end of file