Resolve gh-pages rebase with master