best way to update master if gh-pages branch is ahead?