diff --git a/zsh/.zshrc b/zsh/.zshrc
index f2635fb..8f5e3ba 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -57,9 +57,3 @@ 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
 eval "$(uv generate-shell-completion zsh)"
-<<<<<<< HEAD
-=======
-eval "$(uv generate-shell-completion zsh)"
-eval "$(uv generate-shell-completion zsh)"
-eval "$(uv generate-shell-completion zsh)"
->>>>>>> parent of 2cafc91 (Breaking changes for blink.cmp, so that needed to be updated. Updated keymaps location based on that plugin as well.)