diff --git a/web/hooks/useSendChatMessage.ts b/web/hooks/useSendChatMessage.ts
index 3b25cdcdb8..2a9e7a102b 100644
--- a/web/hooks/useSendChatMessage.ts
+++ b/web/hooks/useSendChatMessage.ts
@@ -54,11 +54,7 @@ export default function useSendChatMessage() {
     modelRef.current = activeModel
   }, [activeModel])
 
-<<<<<<< HEAD
   const resendChatMessage = async (currentMessage: ThreadMessage) => {
-=======
-  const resendChatMessage = async () => {
->>>>>>> 36d94890 (fix: Add hack waiting for model loading)
     if (!activeThread) {
       console.error('No active thread')
       return