diff --git a/.gitignore b/.gitignore
index 2700de4a..cf6e349e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -84,4 +84,4 @@ foo.js
 hello.js
 plugins/c9.docker/containers/ci/files/github_c9_newclient
 plugins/c9.docker/containers/shared/files/plugins/salesforce*
-security-audit.log
+security-audit.log
\ No newline at end of file
diff --git a/scripts/install-sdk.sh b/scripts/install-sdk.sh
index 70f0eb11..38448df0 100755
--- a/scripts/install-sdk.sh
+++ b/scripts/install-sdk.sh
@@ -110,8 +110,9 @@ updateCore() {
     fi
     
     # without this git merge fails on windows
-    mv ./scripts/install-sdk.sh  ./scripts/.install-sdk-tmp.sh 
-    cp ./scripts/.install-sdk-tmp.sh ./scripts/install-sdk.sh
+    mv ./scripts/install-sdk.sh  './scripts/.#install-sdk-tmp.sh'
+    rm ./scripts/.install-sdk-tmp.sh 
+    cp './scripts/.#install-sdk-tmp.sh' ./scripts/install-sdk.sh
     git checkout -- ./scripts/install-sdk.sh
 
     git remote add c9 https://github.com/c9/core 2> /dev/null || true