gh pages should merge with master