Resolve gh-pages conflict