merging to gh page