Checkout master first

src/freedombone-upgrade

         git merge --abort
         git stash
         # TODO after stockholm merge change this to git_pull
+        git checkout master
+        git pull $PROJECT_REPO
         git checkout stockholm
         git pull $PROJECT_REPO
         make install