diff --git a/home/programs/git.nix b/home/programs/git.nix
index b2957c1..4af501d 100644
--- a/home/programs/git.nix
+++ b/home/programs/git.nix
@@ -135,11 +135,11 @@
     merge = {
       ff = true;
       conflictstyle = "zdiff3";
-      tool = "nvimdiff4";
+      tool = "nvim";
     };
 
-    "mergetool \"nvimdiff4\"" = {
-      cmd = "nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' -c 'diffoff'";
+    "mergetool \"nvim\"" = {
+      cmd = "nvim $MERGED";
     };
   };
 }