seeing what happens in gh-pages
fix merge conflicts