From 26f0cb3c8bc18945b566063d8489b4e60fb61ade Mon Sep 17 00:00:00 2001
From: Jeffrey Ling <jeffrey.r.ling@gmail.com>
Date: Mon, 9 Dec 2024 04:43:48 -0700
Subject: [PATCH] merge conflict

---
 client/src/App.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/src/App.tsx b/client/src/App.tsx
index 0617c79..2990cb5 100644
--- a/client/src/App.tsx
+++ b/client/src/App.tsx
@@ -505,7 +505,8 @@ const App = () => {
           {mcpClient ? (
             <Tabs
               defaultValue={
-                window.location.hash.slice(1) ||
+                Object.keys(serverCapabilities ?? {}).includes(window.location.hash.slice(1)) ?
+                window.location.hash.slice(1) :
                 serverCapabilities?.resources ? "resources" :
                 serverCapabilities?.prompts ? "prompts" :
                 serverCapabilities?.tools ? "tools" :