gh-pages
encode utf-8
fix conflicts