diff --git a/zsh/config/.zshrc b/zsh/config/.zshrc
index 80eb20e..937306b 100755
--- a/zsh/config/.zshrc
+++ b/zsh/config/.zshrc
@@ -216,7 +216,6 @@ source <(kubectl completion zsh)
 #       I tried sourcing them in the the `.zshenv` files, but did not work.
 _source_if "$ZDOTDIR/.zshrc-local"
 _source_if "$LOCAL_ENV"
-<<<<<<< HEAD
 
 # pnpm
 export PNPM_HOME="/Users/michael/.local/share/pnpm"