Create gh-pages branch via GitHub
Merge
Resolved conflicts