merged gh-pages