Fix mkdocs nav YAML formatting

Dahlia Li · Dahlia Li · commit e9d8a0c104f2 · 2026-02-19T21:21:38.000-05:00
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -21,13 +21,10 @@ nav:
       - Development:
           - Contributing:
               - development/contributing/index.md
-<<<<<<< HEAD
-      - Acknowledgments: acknowledgments.md
-=======
+              
           - Failure Analysis Workflow: 
               - development/failure_analysis_workflow/index.md
-      - Acknowledgements: acknowledgements.md
->>>>>>> 01fb7a8 (WIP contributing guide docs)
+      - Acknowledgments: acknowledgments.md
 
 theme:
   name: material
