Fix merge conflict leftovers

modules/terminal-life/nvim/default.nix

@@ -114,15 +114,10 @@ in {
       # Highlight characters when using f, F, t, and T
       quick-scope
 
-      # get sudo in vim; :SudaWrite <optional filename>
+      # Get sudo in vim; :SudaWrite <optional filename>
       suda-vim
-<<<<<<< Updated upstream
-      vim-gutentags
-      vim-vinegar
-=======
 
-      # undo history etc. per project
->>>>>>> Stashed changes
+      # Undo history etc. per project
       vim-workspace-nvfetcher
 
       # JSON schemas