Create gh-pages branch via GitHub
merge conflicts