diff --git a/mkdocs.yml b/mkdocs.yml
index 763e7dccc..4c6d490a8 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -264,17 +264,14 @@ nav:
               - trulens_eval/api/endpoint/index.md
               - OpenAI: trulens_eval/api/endpoint/openai.md
       - 𝄢 Instruments: trulens_eval/api/instruments.md
-<<<<<<< HEAD
-=======
       - 🛡️ Guardrails:
-        - trulens_eval/api/guardrails/index.md
-        - 🦜️🔗 Langchain Guardrails: trulens_eval/api/guardrails/langchain.md
-        - 🦙 Llama-Index Guardrails: trulens_eval/api/guardrails/llama.md
->>>>>>> f5f298de (fix typo)
+          - trulens_eval/api/guardrails/index.md
+          - 🦜️🔗 Langchain Guardrails: trulens_eval/api/guardrails/langchain.md
+          - 🦙 Llama-Index Guardrails: trulens_eval/api/guardrails/llama.md
       - 🗄 Database:
-        - trulens_eval/api/database/index.md
-        - ✨ Migration: trulens_eval/api/database/migration.md
-        - 🧪 SQLAlchemy: trulens_eval/api/database/sqlalchemy.md
+          - trulens_eval/api/database/index.md
+          - ✨ Migration: trulens_eval/api/database/migration.md
+          - 🧪 SQLAlchemy: trulens_eval/api/database/sqlalchemy.md
       - Utils:
           # - trulens_eval/api/utils/index.md
           - trulens_eval/api/utils/python.md