new github pages
new pages
fix conflicts