diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 3721d3343..5132b639a 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -49,10 +49,6 @@ function current_branch() {
 alias ggpull='git pull origin $(current_branch)'
 compdef ggpull=git
 alias ggpush='git push origin $(current_branch)'
-<<<<<<< HEAD
 compdef ggpush=git
 alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
 compdef ggpnp=git
-=======
-alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
->>>>>>> e5e032f... adding git svn aliases