Create gh-pages branch via GitHub
Resolve merge conflict