diff --git a/publish.sh b/publish.sh
index 425a9b8..a4f29df 100755
--- a/publish.sh
+++ b/publish.sh
@@ -6,13 +6,15 @@ npm version minor
 git push
 
 git checkout teslemetry
-git rebase dev
+git rebase dev -X ours
 git push --force-with-lease
+rm -r dist
 npm publish
 
 git checkout tessie
-git rebase dev
+git rebase dev  -X ours
 git push --force-with-lease
+rm -r dist
 npm publish
 
 git checkout dev
\ No newline at end of file