re-arranged merge with git-pages