diff --git a/.gitignore b/.gitignore
index 6a2ab14..d5f94ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,3 +53,5 @@ nvim/plugin
 
 # alacritty themes
 alacritty/themes
+
+myzsh
diff --git a/zshrc b/zshrc
index 9b27f2b..3fd44c1 100644
--- a/zshrc
+++ b/zshrc
@@ -5,7 +5,6 @@ fi
 export ZSH=$HOME/.oh-my-zsh
 
 ZSH_THEME="powerlevel10k/powerlevel10k"
-
 CASE_SENSITIVE="true"
 
 zstyle ':omz:update' mode auto      # update automatically without asking
@@ -16,41 +15,10 @@ plugins=(zsh-autosuggestions sudo web-search copyfile dirhistory jsontools)
 source $ZSH/oh-my-zsh.sh
 export LANG=en_US.UTF-8
 
-#LAMMPS path variables
-
-#export PYTHONPATH=/home/frosty/Apps/lammps/install/python:$PYTHONPATH
-#export LD_LIBRARY_PATH=/home/frosty/Programs/Python/MolSieve/lammps/install/lib:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=/home/frosty/neomd/lammps/install/lib:$LD_LIBRARY_PATH
-#export SLEPC_DIR=/opt/slepc/linux-c-opt
-
-#petsc path variables
-#export PYTHONPATH=/home/frosty/Programs/Python/NeoMDWeb/petsc/install/lib:$PYTHONPATH
-
-# -n; string is not null
 export EDITOR='nvim'
 export VISUAL='nvim'
-alias fixWifi='sudo rmmod iwlmvm; sudo rmmod iwlwifi; sudo modprobe iwlmvm; sudo modprobe iwlwifi'
-alias sshLANL='ssh -t -l rhnatyshyn wtrw.lanl.gov ssh ch-fe.lanl.gov'
 alias vim='nvim'
 
-function tunnelLANL() {
-    if [ -n "$1" ]
-    then
-        ssh -4 -L 7687:127.0.0.1:7270 rhnatyshyn@wtrw.lanl.gov ssh -L 7270:127.0.0.1:7271 ch-fe ssh -L 7271:127.0.0.1:7687 nid"$1"
-    else
-        echo "Specify a node to connect to!"
-    fi
-}
-
-function scan() {
-    if [ -n "$1" ]
-    then
-	scanimage --device "airscan:w0:CANON INC. TS6100 series" --format=png --output-file "$1" --progress
-    else
-	scanimage --device "airscan:w0:CANON INC. TS6100 series" --format=png --output-file file.png --progress
-    fi
-}
-
 zstyle ':completion:*' completer _complete _approximate
 zstyle ':completion:*' group-name ''
 zstyle ':completion:*' menu select
@@ -59,7 +27,7 @@ zstyle ':completion:*' file-list all
 zstyle ':completion:*' use-cache on
 zstyle ':completion:*' cache-path "$XDG_CACHE_HOME/zsh/.zcompcache"
 
-zstyle :compinstall filename '/home/frosty/.zshrc'
+zstyle :compinstall filename "$HOME/.zshrc"
 
 autoload -Uz compinit; compinit
 HISTFILE=~/.histfile
@@ -68,26 +36,9 @@ SAVEHIST=1000
 bindkey -v # bind keys to vim mode
 
 eval "$(zoxide init zsh)"
-path+=('/home/frosty/.local/bin')
-path+=("/usr/local/bin")
-path+=('/home/frosty/Programs/Python/MolSieve/lammps/install/bin')
-
 export GEM_HOME="$(ruby -e 'puts Gem.user_dir')"
 path+=("$GEM_HOME/bin")
 
-#export PYENV_ROOT="$HOME/.pyenv"
-#command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"
-#eval "$(pyenv init -)"
-
-path+=('/home/frosty/.ghcup/bin/')
-path+=('/home/frosty/.cabal/bin')
-path+=('/home/frosty/Apps/ovito-pro/bin')
-path+=('/home/frosty/.cargo/bin')
-path+=('/home/frosty/neomd/neo4j-community-4.4.29/bin/')
-path+=('/home/frosty/neomd/parsplice/install/bin')
-
-alias resetDB='neo4j stop; rm -rf /home/frosty/neomd/neo4j_data; neo4j start' 
-
 # Restart your shell for the changes to take effect.
 export PYENV_ROOT="$HOME/.pyenv"
 [[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
@@ -95,3 +46,6 @@ eval "$(pyenv init -)"
 
 export PATH
 [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
+
+# put your paths and aliases here to avoid merge conflicts 
+[[ ! -f ~/.myzsh ]] || source ~/.myzsh