conflict in gh-pages #43
Description
When the master branch is updated, all we need to do is to
- checkout gh-pages
- merge origin:master, and
- push
to get installed the latest version on the web version. However, sometimes we experience conflicts at the second step, which might need to be examined. (We need a reproducable way .)