Merging in gh-pages