Fix old merge conflict
epub directives
rst2pdf options