Fixing merge conflicts in BaseChat.tsx

.gitignore

@@ -31,3 +31,4 @@ dist-ssr
 _worker.bundle
 
 Modelfile
+modelfiles

app/components/chat/BaseChat.tsx

@@ -113,7 +113,6 @@ export const BaseChat = React.forwardRef<HTMLDivElement, BaseChatProps>(
     ref,
   ) => {
     const TEXTAREA_MAX_HEIGHT = chatStarted ? 400 : 200;
-    const [provider, setProvider] = useState(DEFAULT_PROVIDER);
     const [apiKeys, setApiKeys] = useState<Record<string, string>>({});
 
     useEffect(() => {
@@ -200,8 +199,6 @@ export const BaseChat = React.forwardRef<HTMLDivElement, BaseChatProps>(
                   provider={provider}
                   setProvider={setProvider}
                   providerList={providerList}
-                  provider={provider}
-                  setProvider={setProvider}
                 />
                 <APIKeyManager
                   provider={provider}