remove bad merges

client/src/App.tsx

@@ -45,7 +45,7 @@ import Sidebar from "./components/Sidebar";
 import ToolsTab from "./components/ToolsTab";
 import { DEFAULT_INSPECTOR_CONFIG } from "./lib/constants";
 import { InspectorConfig } from "./lib/configurationTypes";
-import { getMCPProxyAddress, getMCPServerRequestTimeout } from "./utils/configUtils";
+import { getMCPProxyAddress } from "./utils/configUtils";
 import { useToast } from "@/hooks/use-toast";
 
 const params = new URLSearchParams(window.location.search);

client/src/lib/hooks/useConnection.ts

@@ -49,7 +49,6 @@ interface UseConnectionOptions {
   env: Record<string, string>;
   bearerToken?: string;
   headerName?: string;
-  requestTimeout?: number;
   config: InspectorConfig;
   onNotification?: (notification: Notification) => void;
   onStdErrNotification?: (notification: Notification) => void;
@@ -67,7 +66,6 @@ export function useConnection({
   env,
   bearerToken,
   headerName,
-  requestTimeout,
   config,
   onNotification,
   onStdErrNotification,