commit around merging gh-pages and master branches