fix gh-pages
fix merge conflicts