diff --git a/zsh/.p10k.zsh b/zsh/.p10k.zsh
index 48421b2..46a7c2f 100644
--- a/zsh/.p10k.zsh
+++ b/zsh/.p10k.zsh
@@ -31,11 +31,7 @@
   # The list of segments shown on the left. Fill it with the most important segments.
   typeset -g POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(
     # os_icon               # os identifier
-<<<<<<< HEAD
-    context
-=======
     context                 # user@hostname
->>>>>>> main
     dir                     # current directory
     vcs                     # git status
     # prompt_char           # prompt symbol
@@ -84,11 +80,7 @@
     gcloud                  # google cloud cli account and project (https://cloud.google.com/)
     google_app_cred         # google application credentials (https://cloud.google.com/docs/authentication/production)
     toolbox                 # toolbox name (https://github.com/containers/toolbox)
-<<<<<<< HEAD
-    # context                 # user@hostname
-=======
     #context                 # user@hostname
->>>>>>> main
     nordvpn                 # nordvpn connection status, linux only (https://nordvpn.com/)
     ranger                  # ranger shell (https://github.com/ranger/ranger)
     nnn                     # nnn shell (https://github.com/jarun/nnn)