fix merge conflict
Merge branch 'pages-hotfix' into gh-pages