diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 1bbb0abb2..60900a2a9 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -13,10 +13,7 @@ alias gb='git branch'
 alias gba='git branch -a'
 alias gcount='git shortlog -sn'
 alias gcp='git cherry-pick'
-<<<<<<< HEAD:plugins/git.plugin.zsh
-=======
 alias glg='git log --stat --max-count=5'
->>>>>>> upstream/master:plugins/git/git.plugin.zsh
 
 # Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'