diff --git a/src/freedombone-utils-git b/src/freedombone-utils-git
index 80aa1fb7..1a4d7a1f 100755
--- a/src/freedombone-utils-git
+++ b/src/freedombone-utils-git
@@ -54,6 +54,7 @@ function git_pull {
         echo $'git_pull no repo specified'
     fi
 
+    git merge --abort
     git stash
     git remote set-url origin $1
     git checkout master