merge gh-pages and origin