cleaner URLs with no .html endings
merge conflicts
mend