* Add article, toc, and redirects * Add info on use of a callback to run custom logic and resolve merge conflicts