fix: merge conflict issues

app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue

@@ -116,7 +116,6 @@ export default {
     },
     allowSignature: { type: Boolean, default: false },
     allowEmoji: { type: Boolean, default: false },
-    allowAiAssist: { type: Boolean, default: false },
     allowVideoCall: { type: Boolean, default: false },
     allowFileUpload: { type: Boolean, default: false },
     allowAudioRecorder: { type: Boolean, default: false },
@@ -297,8 +296,7 @@ export default {
   <div class="flex justify-between p-3" :class="wrapClass">
     <div class="left-wrap">
       <NextButton
-        v-if="allowEmoji"
-        v-if="!isEditorDisabled"
+        v-if="allowEmoji && !isEditorDisabled"
         v-tooltip.top-end="$t('CONVERSATION.REPLYBOX.TIP_EMOJI_ICON')"
         icon="i-ph-smiley-sticker"
         slate
@@ -307,8 +305,7 @@ export default {
         @click="toggleEmojiPicker"
       />
       <FileUpload
-        v-if="allowFileUpload"
-        v-if="showAttachButton"
+        v-if="showAttachButton && allowFileUpload"
         ref="uploadRef"
         v-tooltip.top-end="$t('CONVERSATION.REPLYBOX.TIP_ATTACH_ICON')"
         input-id="conversationAttachment"
@@ -387,7 +384,7 @@ export default {
         sm
         @click="$emit('selectContentTemplate')"
       />
-      <VideoCallButtonnPrivateNote
+      <VideoCallButton
         v-if="
           allowVideoCall &&
           (isAWebWidgetInbox || isAPIInbox) &&