merge gh pages changes