fix gh-pages
fix conflicts