Github-pages
+1 slide
fixing conflicts