merge gh page with master