diff --git a/docs/4_tools-and-workflows.md b/docs/4_tools-and-workflows.md
index d317f07..0e92ebb 100644
--- a/docs/4_tools-and-workflows.md
+++ b/docs/4_tools-and-workflows.md
@@ -2,7 +2,11 @@
 
 > MCP tools for external agents and the guides system for context sharing.
 
+<<<<<<< HEAD
 **How it works:** RA-OS exposes tools via MCP that external AI agents can call to read, create, and update your knowledge graph. Guides are markdown documents that help external agents understand your knowledge base.
+=======
+**How it works:** RA-H Light exposes tools via MCP that external AI agents can call to read, create, and update your knowledge graph. Guides are markdown documents that help external agents understand your knowledge base.
+>>>>>>> 05ac0a8 (docs: update tools and workflows)
 
 ---