seed gh-pages
fix merge