diff --git a/zsh/.config/zsh/zsh-aliases b/zsh/.config/zsh/zsh-aliases
index be19f93..d076172 100644
--- a/zsh/.config/zsh/zsh-aliases
+++ b/zsh/.config/zsh/zsh-aliases
@@ -1,10 +1,7 @@
 # configure aliases
 #alias zshconfig="$ZDOTDIR"
-<<<<<<< HEAD
-=======
 alias zdots() { nvim "$ZDOTDIR" }
 alias dots() { nvim ~/.dotfiles }
->>>>>>> master
 
 alias mkcd() { mkdir $1 && cd $1 }
 alias l() { ls -lah "$@" }
@@ -15,11 +12,8 @@ alias vim() { nvim "$@" }
 # git
 alias g() { git "$@" }
 alias ga() { git add . }
-<<<<<<< HEAD
-=======
 alias gcb() { git checkout -b "$@" }
 alias gco() { git checkout "$@" }
->>>>>>> master
 alias gma() { git add . && git commit -m "$1" }
 alias gs() { git status }