merging with gh-pages