diff --git a/modules/programs/git.nix b/modules/programs/git.nix
index a26a927..0ff6e0e 100644
--- a/modules/programs/git.nix
+++ b/modules/programs/git.nix
@@ -1,5 +1,6 @@
 {
   delib,
+  lib,
   pkgs,
   ...
 }:
@@ -93,7 +94,7 @@ delib.module {
           conflict-marker-style = "git";
           # diff-formatter = "delta";
           editor = "codium -w";
-          merge-editor = "vscodium";
+          merge-editor = lib.mkForce "vscodium";
         };
 
         revset-aliases = {
@@ -113,13 +114,6 @@ delib.module {
           solve = ["resolve" "--tool" "mergiraf"];
         };
 
-        merge-tools.mergiraf = {
-          program = "mergiraf";
-          merge-args = ["merge" "$base" "$left" "$right" "-o" "$output"];
-          merge-conflict-exit-codes = [1];
-          conflict-marker-style = "git";
-        };
-
         git = {
           sign-on-push = true;
           write-change-id-header = true;