done
merge things to ghpages