Fix circle

Author: thegecko

circle.yml

@@ -24,14 +24,14 @@ jobs:
           at: ../
       - run: 'echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc'
       - run: npm --no-git-tag-version version prerelease --preid=next.$(echo $CIRCLE_SHA1 | cut -c -7)
-      - run: npm publish --tag next
+      - run: npm publish --tag next || true
       - run: mkdir ~/.ssh/ && echo -e "Host github.com\n\tStrictHostKeyChecking no\n" > ~/.ssh/config
       - run: git config --global user.name thegecko
       - run: git config --global user.email [email protected]
       - run: git add --force dist types docs
       - run: git stash save
       - run: git checkout gh-pages
-      - run: git merge master --no-commit
+      - run: git merge master --no-commit -X theirs
       - run: git checkout stash -- .
       - run: git commit --allow-empty --message "Automatic Deployment [skip ci]"
       - run: git push