Conflicts: docs/changelog.rst pelican/tests/output/basic/tag/bar.html pelican/tests/output/basic/tag/baz.html pelican/tests/output/basic/tag/foo.html pelican/tests/output/custom/tag/bar.html pelican/tests/output/custom/tag/baz.html pelican/tests/output/custom/tag/foo.html