deal with merge conflicts

Author: borisdevos

docs/make.jl

@@ -13,11 +13,15 @@ links = InterLinks(
 pages = [
     "Home" => "index.md",
     "Manual" => [
-        "man/intro.md", "man/tutorial.md", "man/categories.md",
+        "man/intro.md", "man/tutorial.md",
         "man/spaces.md", "man/sectors.md", "man/tensors.md",
     ],
-    "Library" => ["lib/sectors.md", "lib/spaces.md", "lib/tensors.md"],
+    "Library" => [
+        "lib/sectors.md", "lib/fusiontrees.md",
+        "lib/spaces.md", "lib/tensors.md",
+    ],
     "Index" => ["index/index.md"],
+    "Appendix" => ["appendix/categories.md"],
 ]
 
 makedocs(;