merging in gh-pages