diff --git a/knowledge/INDEX.yaml b/knowledge/INDEX.yaml
index 1e07fe8..552ed8c 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"
@@ -117,7 +113,6 @@ task_routing:
       - provenance_verification
       - large_file_distribution
 
-<<<<<<< HEAD
   desearch_real_time:
     load:
       - desearch.integration.yaml
@@ -128,11 +123,6 @@ task_routing:
       - agent_context_enrichment
       - event_verification
       - sentiment_analysis
-=======
-  dataverse_social_data:
-    load:
-      - dataverse.integration.yaml
->>>>>>> 51f1cec7a22db85aa7412760f35fc2c5cfc43b69
 
   cli_operations:
     load: