diff --git a/.config/theme/quick-term.omp.json b/.config/theme/quick-term.omp.json
index e80590b..b7cc891 100644
--- a/.config/theme/quick-term.omp.json
+++ b/.config/theme/quick-term.omp.json
@@ -1,6 +1,5 @@
 {
   "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
-<<<<<<< HEAD
   "palette": {
     "text": "#ffffff",
     "darktext": "#6e738d",
@@ -12,21 +11,14 @@
     "grey": "#e4e4e4",
     "ahead": "#54433a"
   },
-=======
->>>>>>> d5a4cd4 (Add file for Oh-my-posh theme)
   "blocks": [
     {
       "alignment": "left",
       "newline": true,
       "segments": [
         {
-<<<<<<< HEAD
           "background": "p:mauve",
           "foreground": "p:text",
-=======
-          "background": "#d75f00",
-          "foreground": "#f2f3f8",
->>>>>>> d5a4cd4 (Add file for Oh-my-posh theme)
           "properties": {
             "alpine": "\uf300",
             "arch": "\uf303",
@@ -50,26 +42,16 @@
           "type": "os"
         },
         {
-<<<<<<< HEAD
           "background": "p:grey",
           "foreground": "p:darktext",
-=======
-          "background": "#e4e4e4",
-          "foreground": "#4e4e4e",
->>>>>>> d5a4cd4 (Add file for Oh-my-posh theme)
           "style": "powerline",
           "powerline_symbol": "\ue0b0",
           "template": " {{ .UserName }} ",
           "type": "session"
         },
         {
-<<<<<<< HEAD
           "background": "p:blue",
           "foreground": "p:text",
-=======
-          "background": "#0087af",
-          "foreground": "#f2f3f8",
->>>>>>> d5a4cd4 (Add file for Oh-my-posh theme)
           "properties": {
             "style": "agnoster_short",
             "max_depth": 3,
@@ -82,20 +64,10 @@
           "type": "path"
         },
         {
-<<<<<<< HEAD
           "background": "p:green",
           "foreground": "p:text",
           "background_templates": [
             "{{ if or (.Working.Changed) (.Staging.Changed) }}p:maroon{{ end }}"
-=======
-          "background": "#378504",
-          "foreground": "#f2f3f8",
-          "background_templates": [
-            "{{ if or (.Working.Changed) (.Staging.Changed) }}#a97400{{ end }}",
-            "{{ if and (gt .Ahead 0) (gt .Behind 0) }}#54433a{{ end }}",
-            "{{ if gt .Ahead 0 }}#744d89{{ end }}",
-            "{{ if gt .Behind 0 }}#744d89{{ end }}"
->>>>>>> d5a4cd4 (Add file for Oh-my-posh theme)
           ],
           "properties": {
             "branch_max_length": 25,
@@ -118,13 +90,8 @@
       "alignment": "right",
       "segments": [
         {
-<<<<<<< HEAD
           "background": "p:grey",
           "foreground": "p:darktext",
-=======
-          "background": "#e4e4e4",
-          "foreground": "#585858",
->>>>>>> d5a4cd4 (Add file for Oh-my-posh theme)
           "properties": {
             "style": "austin",
             "always_enabled": true
@@ -136,13 +103,8 @@
           "type": "executiontime"
         },
         {
-<<<<<<< HEAD
           "background": "p:mauve",
           "foreground": "p:text",
-=======
-          "background": "#d75f00",
-          "foreground": "#f2f3f8",
->>>>>>> d5a4cd4 (Add file for Oh-my-posh theme)
           "properties": {
             "time_format": "15:04:05"
           },
@@ -160,11 +122,7 @@
       "newline": true,
       "segments": [
         {
-<<<<<<< HEAD
           "foreground": "p:mauve",
-=======
-          "foreground": "#d75f00",
->>>>>>> d5a4cd4 (Add file for Oh-my-posh theme)
           "style": "plain",
           "template": "\u2570\u2500 {{ if .Root }}#{{else}}${{end}}",
           "type": "text"
diff --git a/.zshrc b/.zshrc
index c3bcb4a..eda077d 100644
--- a/.zshrc
+++ b/.zshrc
@@ -64,7 +64,7 @@ eval "$(oh-my-posh init zsh --config ~/.config/theme/quick-term.omp.json)"
 fast-theme LOCAL:catppuccin-macchiato >/dev/null
 
 # Preferred editor for local and remote sessions
-export EDITOR=vim
+export EDITOR=nvim
 
 # Do not print user@hostname if user is myself
 DEFAULT_USER=`whoami`