diff --git a/configs/.bashrc b/configs/.bashrc
index 6862d6f..9cf2110 100644
--- a/configs/.bashrc
+++ b/configs/.bashrc
@@ -110,27 +110,4 @@ if ! shopt -oq posix; then
   elif [ -f /etc/bash_completion ]; then
     . /etc/bash_completion
   fi
-fi
-
-export NVM_DIR="$HOME/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
-alias vim='nvim'
-alias vim='nvim'
-alias vim='nvim'
-alias vim='nvim'
-alias vim='nvim'
-alias vim='nvim'
-<<<<<<< HEAD:.bashrc
-
-#THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!!
-export SDKMAN_DIR="/home/jim/.sdkman"
-[[ -s "/home/jim/.sdkman/bin/sdkman-init.sh" ]] && source "/home/jim/.sdkman/bin/sdkman-init.sh"
-=======
-alias vim='nvim'
-alias vim='nvim'
-alias vim='nvim'
-alias vim='nvim'
-
-[[ -s "/home/jim/.gvm/scripts/gvm" ]] && source "/home/jim/.gvm/scripts/gvm"
->>>>>>> 63919a2fee0f7a41a5f3dd6b89def7847aa42cae:configs/.bashrc
+fi
\ No newline at end of file
diff --git a/configs/.zshrc b/configs/.zshrc
index 56bf1a4..d3ad850 100644
--- a/configs/.zshrc
+++ b/configs/.zshrc
@@ -27,17 +27,6 @@ source $HOME/.dotfiles/configs/zsh/aliases.sh
 export PATH="$PATH:$HOME/.yarn/bin"
 export PATH="$PATH:$HOME/.local/bin"
 
-<<<<<<< HEAD:.zshrc
-export GOROOT="$HOME/go"
-export GOPATH="$HOME/SYNC"
-export PATH="$PATH:$GOROOT/bin"
-
-eval "$(direnv hook zsh)"
-
-#Java version manager 
-export SDKMAN_DIR="$HOME/.sdkman"
-[[ -s "$SDKMAN_DIR/bin/sdkman-init.sh" ]] && source "$SDKMAN_DIR/bin/sdkman-init.sh"
-=======
 ## GO STUFF
 export GOROOT="/usr/local/bin/go"
 export GOPATH="$HOME/go"
@@ -55,7 +44,6 @@ fi
 #Java version manager 
 export SDKMAN_DIR="$HOME/.sdkman"
 [[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh"
->>>>>>> 63919a2fee0f7a41a5f3dd6b89def7847aa42cae:configs/.zshrc
 
 # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
 [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
@@ -66,9 +54,3 @@ export SDKMAN_DIR="$HOME/.sdkman"
 # Node Version manager
 export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
-<<<<<<< HEAD:.zshrc
-=======
-
-# To customize prompt, run `p10k configure` or edit ~/.dotfiles/configs/.p10k.zsh.
-[[ ! -f ~/.dotfiles/configs/.p10k.zsh ]] || source ~/.dotfiles/configs/.p10k.zsh
->>>>>>> 63919a2fee0f7a41a5f3dd6b89def7847aa42cae:configs/.zshrc
diff --git a/setup.sh b/setup.sh
index e9f69ab..d3ee9fc 100755
--- a/setup.sh
+++ b/setup.sh
@@ -9,9 +9,13 @@ cd "$(dirname "$0")"
 echo "-- welcome to my setup script --"
 echo "-- installing prerequesits (git, curl) --"
 
-if [ "$(prompt " - do you want to continue")" != "yes" ]; then
-  echo "   alllrighty then, byyye"
-  exit
+INTERACTIVE=$(tty -s && echo "true" || echo "false")
+
+if [ $INTERACTIVE = "true" ]; then
+  if [ "$(prompt " - do you want to continue")" != "yes" ]; then
+    echo "   alllrighty then, byyye"
+    exit
+  fi
 fi
 
 echo ""
@@ -32,7 +36,10 @@ OPTIONS_LABELS=("zsh + oh-my-zsh" "Neovim" "Direnv" "Go Version Manager" "Node V
 for i in "${!OPTIONS_VALUES[@]}"; do
   OPTIONS_STRING+="${OPTIONS_VALUES[$i]} (${OPTIONS_LABELS[$i]});"
 done
-multiselect SELECTED "$OPTIONS_STRING"
+
+if [ $INTERACTIVE = "true" ]; then
+  multiselect SELECTED "$OPTIONS_STRING"
+fi
 
 # Variables
 INST_ZSH=${SELECTED[0]}
@@ -42,6 +49,10 @@ INST_GVM=${SELECTED[3]}
 INST_NVM=${SELECTED[4]}
 INST_SDKM=${SELECTED[5]}
 
+if [ $INTERACTIVE = "false" ]; then
+  INST_ZSH = true
+fi
+
 echo "-----------------------------------"
 
 echo -e "-- installing programs --"