merge master and gh pages like llad