diff --git a/client/src/components/Main/TextChat.jsx b/client/src/components/Main/TextChat.jsx
index 4544c8a35d..0038f37a7a 100644
--- a/client/src/components/Main/TextChat.jsx
+++ b/client/src/components/Main/TextChat.jsx
@@ -100,10 +100,6 @@ export default function TextChat({ messages }) {
     const { messages, _currentMsg, message, isCustomModel, sender, isRegenerate } =
       currentState;
     const { model, chatGptLabel, promptPrefix } = message;
-<<<<<<< HEAD
-    if (isRegenerate) dispatch(setMessages([...messages, responseMessage]));
-    else dispatch(setMessages([...messages, requestMessage, responseMessage]));
-=======
     if (isRegenerate)
       dispatch(
         setMessages([...messages, responseMessage,])
@@ -113,7 +109,6 @@ export default function TextChat({ messages }) {
         setMessages([...messages, requestMessage, responseMessage,])
       );
     dispatch(setSubmitState(false));
->>>>>>> 92d0d11 (feat: save cancelled flag in message)
 
     const isBing = model === 'bingai' || model === 'sydney';
 
@@ -213,14 +208,10 @@ export default function TextChat({ messages }) {
     }
 
     const currentState = submission;
-<<<<<<< HEAD
-    let currentMsg = { ...currentState.message };
 
-=======
-    let currentMsg = {...currentState.message};
+    let currentMsg = { ...currentState.message };
     let latestResponseText = '';
     
->>>>>>> 92d0d11 (feat: save cancelled flag in message)
     const { server, payload } = createPayload(submission);
     const onMessage = (e) => {
       if (stopStream) {
@@ -383,7 +374,7 @@ export default function TextChat({ messages }) {
               onChange={changeHandler}
               onCompositionStart={handleCompositionStart}
               onCompositionEnd={handleCompositionEnd}
-              placeholder={disabled ? 'Choose another model or customize GPT again' : isNotAppendable ? 'Can not send new message after an error or unfinished response.' : ''}
+              placeholder={disabled ? 'Choose another model or customize GPT again' : isNotAppendable ? 'Try to regenerate the incomplete response.' : ''}
               disabled={disabled || isNotAppendable}
               className="m-0 h-auto max-h-52 resize-none overflow-auto border-0 bg-transparent p-0 pl-12 pr-8 leading-6 focus:outline-none focus:ring-0 focus-visible:ring-0 dark:bg-transparent md:pl-8"
             />
diff --git a/client/src/utils/handleSubmit.js b/client/src/utils/handleSubmit.js
index 9e48c2028a..a9fbdb0d45 100644
--- a/client/src/utils/handleSubmit.js
+++ b/client/src/utils/handleSubmit.js
@@ -41,13 +41,6 @@ const useMessageHandler = () => {
     const currentMsg = { sender: 'User', text, current: true, isCreatedByUser: true, parentMessageId, conversationId, messageId: fakeMessageId };
     const initialResponse = { sender, text: '', parentMessageId: isRegenerate?messageId:fakeMessageId, messageId: (isRegenerate?messageId:fakeMessageId) + '_', submitting: true };
 
-    dispatch(setSubmitState(true));
-    if (isRegenerate) {
-      dispatch(setMessages([...currentMessages, initialResponse]));
-    } else {
-      dispatch(setMessages([...currentMessages, currentMsg, initialResponse]));
-      dispatch(setText(''));  
-    }
     const submission = {
       convo,
       isCustomModel,
@@ -63,7 +56,16 @@ const useMessageHandler = () => {
       initialResponse,
       sender,
     };
+
     console.log('User Input:', text);
+
+    if (isRegenerate) {
+      dispatch(setMessages([...currentMessages, initialResponse]));
+    } else {
+      dispatch(setMessages([...currentMessages, currentMsg, initialResponse]));
+      dispatch(setText(''));  
+    }
+    dispatch(setSubmitState(true));
     dispatch(setSubmission(submission));
   }