diff --git a/arch-graphical-install-auto.sh b/arch-graphical-install-auto.sh
index 3c225ad..9f3f328 100755
--- a/arch-graphical-install-auto.sh
+++ b/arch-graphical-install-auto.sh
@@ -58,6 +58,7 @@ function gitclone() {
     git config --global user.name "user"
     git config --global push.default simple
     git config --global pull.rebase true
+    git config --global merge.tool vimdiff
     git config --global --add safe.directory '*'
 
     # Aktualisiere die Repositiories
diff --git a/arch-install.sh b/arch-install.sh
index ec376af..d3501f3 100755
--- a/arch-install.sh
+++ b/arch-install.sh
@@ -4,7 +4,6 @@ set -ex
 
 clear
 
-git config --global credential.helper store
 arch=$(uname -m)
 branch=master
 repo=SpectreOS
@@ -83,6 +82,7 @@ function gitclone() {
     git config --global user.name "user"
     git config --global push.default simple
     git config --global pull.rebase true
+    git config --global merge.tool vimdiff
     if [ -d "/opt/${repo}" ]; then
         echo "${repo} existiert bereits!!!"
         cd /opt/${repo}