diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index a7e586236..04f221de4 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -13,7 +13,6 @@ alias gb='git branch'
 alias gba='git branch -a'
 alias gcount='git shortlog -sn'
 alias gcp='git cherry-pick'
-<<<<<<< HEAD
 alias gsub='git submodule'
 
 =======