seed gh-pages
merge conflicts