Create gh-pages branch via GitHub
resolve conflict