merge conclicts fix

mcpo_config.json

@@ -0,0 +1,18 @@
+{
+    "mcpServers": {
+        "gitea_stdio": {
+            "command": "gitea-mcp",
+            "args": ["-t", "stdio", "--host", "https://git.aridgwayweb.com"],
+            "env": {
+                "GITEA_ACCESS_TOKEN": "bac6a1e753d6f2c0b848bd1cbad82965b43ea480"
+            }
+        },
+        "homeassistant": {
+            "type": "sse",
+            "url": "https://homeassistant.aridgwayweb.com/mcp_server/sse",
+            "headers": {
+                "Authorization": "Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiIwZmM4ZTIyNGFlOGI0MGIxOWJmNWE2YzI3NmRkYTBkYiIsImlhdCI6MTc1MzE4MzUwNSwiZXhwIjoyMDY4NTQzNTA1fQ.At_LG5QAuIzeM470tTokbp-XIq3ytf7j5SsAmpoPrLk"
+            }
+        }
+    }
+}