fix: merge errors

frontend/src/settings/Analytics.tsx

@@ -192,7 +192,6 @@ export default function Analytics() {
   return (
     <div className="mt-12">
       <div className="flex flex-col items-start">
-
         <div className="flex flex-col gap-3">
           <p className="font-bold text-jet dark:text-bright-gray">
             {t('settings.analytics.filterByChatbot')}
@@ -223,41 +222,6 @@ export default function Analytics() {
             border="border"
           />
         </div>
-        {loadingChatbots ? (
-          <SkeletonLoader component="dropdown" />
-        ) : (
-          <div className="flex flex-col gap-3">
-            <p className="font-bold text-jet dark:text-bright-gray">
-              {t('settings.analytics.filterByChatbot')}
-            </p>
-            <Dropdown
-              size="w-[55vw] sm:w-[360px]"
-              options={[
-                ...chatbots.map((chatbot) => ({
-                  label: chatbot.name,
-                  value: chatbot.id,
-                })),
-                { label: t('settings.analytics.none'), value: '' },
-              ]}
-              placeholder={t('settings.analytics.selectChatbot')}
-              onSelect={(chatbot: { label: string; value: string }) => {
-                setSelectedChatbot(
-                  chatbots.find((item) => item.id === chatbot.value),
-                );
-              }}
-              selectedValue={
-                (selectedChatbot && {
-                  label: selectedChatbot.name,
-                  value: selectedChatbot.id,
-                }) ||
-                null
-              }
-              rounded="3xl"
-              border="border"
-              borderColor="gray-700"
-            />
-          </div>
-        )}
 
         {/* Messages Analytics */}
         <div className="mt-8 w-full flex flex-col [@media(min-width:1080px)]:flex-row gap-3">