Merge with original gh pages