diff --git a/themes/powerline.zsh-theme b/themes/powerline.zsh-theme
index c4f074935..860eb7a74 100644
--- a/themes/powerline.zsh-theme
+++ b/themes/powerline.zsh-theme
@@ -204,7 +204,3 @@ PROMPT='%{%f%b%k%}$(build_prompt) '
 RPROMPT='%{%f%r%k%}$(build_rprompt) '
 
 
-<<<<<<< HEAD
-
-=======
->>>>>>> 0166395a0ca78d2d253a3f38272d6542bdf2efda