merging gh-pages sbranch