merge branches to gh-pages