dokuwiki-plugin-conflictmerger by Daniel Calviño Sánchez