Revert "Revert "reverted my poor merge""

This reverts commit ebf4cc084591b99ad42c73ea90bb20b74a500fef.

Conflicts:
	mkdocs.yml