fixing merge conflict on mkdocs.yml

mkdocs.yml

@@ -45,6 +45,7 @@ markdown_extensions:
   - pymdownx.magiclink
   - pymdownx.mark
   - pymdownx.smartsymbols
+  - pymdownx.snippets
   - pymdownx.superfences
   - pymdownx.tabbed
   - pymdownx.tilde
@@ -57,11 +58,12 @@ markdown_extensions:
 nav:
   - "Introduction":
       - index.md
-      - "Frequently Asked Questions": intro/faq.md
-      - "Project Strategy": intro/strategy.md
-      - "Project Status": intro/bikemap.md
-      - "Managed Hosting": intro/managed.md
-      - "Get In Touch": intro/contact.md
+      - "Frequently asked questions": intro/faq.md
+      - "Project strategy": intro/strategy.md
+      - "Comparisons": intro/comparisons.md
+      - "Project status": intro/bikemap.md
+      - "Managed hosting": intro/managed.md
+      - "Get in touch": intro/contact.md
       - "Credits": intro/credits.md
   - "Operators":
       - operators/index.md
@@ -95,9 +97,12 @@ nav:
       - "Cheat Sheet": abra/cheat-sheet.md
   - "Get Involved":
       - get-involved/index.md
+      - "Support Us": get-involved/support.md
   - "Federation":
       - federation/index.md
-      - "FAQ": federation/faq.md
+      - "Bylaws": federation/bylaws.md
+      - "Finance": federation/finance.md
+      - "Membership": federation/membership.md
       - "Resolutions":
         - federation/resolutions/index.md
         - "Passed":
@@ -115,20 +120,15 @@ nav:
           - federation/resolutions/passed/012.md
           - federation/resolutions/passed/014.md
           - federation/resolutions/passed/015.md
-        - "In progress":
-          - federation/resolutions/in-progress/index.md
+        - "In Progress":
+          - federation/resolutions/in-progress/013.md
           - federation/resolutions/in-progress/016.md
           - federation/resolutions/in-progress/017.md
-          - federation/resolutions/drafts/013.md
-        - "Draft":
-          - federation/resolutions/drafts/index.md
-      - "Finance": federation/finance.md
-      - "Membership": federation/membership.md
       - "Minutes":
         - federation/minutes/index.md
         - "2022":
           - federation/minutes/2022-03-03.md
-      - "Digital tools": federation/tools.md
+      - "Digital Tools": federation/tools.md
   - "Glossary":
     - glossary/index.md