update gh pages
commiting local changes
fix merge conflicts