fix merge into gh-pages