From 8e04dcfcdc594a23266b1889163e019fc9256f06 Mon Sep 17 00:00:00 2001
From: duotang12 <30913218+duotang12@users.noreply.github.com>
Date: Thu, 5 Feb 2026 07:48:37 -0500
Subject: [PATCH 1/2] Fixed merge conflict in INDEX.yaml

---
 knowledge/INDEX.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/knowledge/INDEX.yaml b/knowledge/INDEX.yaml
index 1e07fe8..21acbbe 100644
--- a/knowledge/INDEX.yaml
+++ b/knowledge/INDEX.yaml
@@ -38,13 +38,9 @@ files_by_category:
   integrations:
     chutes.integration.yaml: "SN64 LLM inference API"
     basilica.containers.yaml: "container execution for agent subnets"
-<<<<<<< HEAD
-    hippius.integration.yaml: "SN13 decentralized storage, S3/IPFS, provenance"
     desearch.integration.yaml: "SN22 real-time search, Twitter/Reddit/web data"
-=======
     hippius.integration.yaml: "SN75 decentralized storage, S3/IPFS, provenance"
     dataverse.integration.yaml: "SN13 social data API, X and Reddit scraping"
->>>>>>> 51f1cec7a22db85aa7412760f35fc2c5cfc43b69
     sdk.quick_reference.yaml: "Python SDK patterns, token trading"
     btcli.reference.yaml: "CLI command reference"
     local.development.yaml: "local subtensor setup"

From 4d280b6dc4e04b10cfc53a8e4f97fe7c06beeb19 Mon Sep 17 00:00:00 2001
From: duotang12 <30913218+duotang12@users.noreply.github.com>
Date: Thu, 5 Feb 2026 07:53:51 -0500
Subject: [PATCH 2/2] Update INDEX.yaml

Desearch block adjustment
---
 knowledge/INDEX.yaml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/knowledge/INDEX.yaml b/knowledge/INDEX.yaml
index 21acbbe..552ed8c 100644
--- a/knowledge/INDEX.yaml
+++ b/knowledge/INDEX.yaml
@@ -113,7 +113,6 @@ task_routing:
       - provenance_verification
       - large_file_distribution
 
-<<<<<<< HEAD
   desearch_real_time:
     load:
       - desearch.integration.yaml
@@ -124,11 +123,6 @@ task_routing:
       - agent_context_enrichment
       - event_verification
       - sentiment_analysis
-=======
-  dataverse_social_data:
-    load:
-      - dataverse.integration.yaml
->>>>>>> 51f1cec7a22db85aa7412760f35fc2c5cfc43b69
 
   cli_operations:
     load: