diff --git a/hosts/randolph/home.nix b/hosts/randolph/home.nix
index 8eb2534..8d1f051 100644
--- a/hosts/randolph/home.nix
+++ b/hosts/randolph/home.nix
@@ -47,6 +47,7 @@ in {
       archivo = callPackage ../../pkgs/archivo/archivo.nix { };
       highway-gothic = callPackage ../../pkgs/highway-gothic/highway-gothic.nix { };
       olympus = callPackage ../../pkgs/olympus/olympus.nix { };
+      kakmerge = callPackage ../../pkgs/kakmerge/kakmerge.nix { };
     in [ gcc tree-sitter ] ++ # Basic dev tools
     [ marksman nil ] ++ # Language servers except those installed through package sections
     [ texliveFull texlab ] ++ # LaTeX
@@ -120,7 +121,7 @@ in {
     ] ++ # Fonts
     # [ papirus-icon-theme ] ++ # Icons
     # [ vanilla-dmz ] ++ # Cursor
-    [ ] ++ # Temp
+    [ kakmerge ] ++ # Temp
     [ ];
 
   programs.home-manager.enable = true;
diff --git a/pkgs/kakmerge/kakmerge.nix b/pkgs/kakmerge/kakmerge.nix
new file mode 100644
index 0000000..db4bda7
--- /dev/null
+++ b/pkgs/kakmerge/kakmerge.nix
@@ -0,0 +1,17 @@
+{ pkgs }:
+with pkgs;
+stdenv.mkDerivation rec {
+  name = "kakmerge";
+  version = "860b686";
+
+  src = fetchFromGitHub {
+    owner = "lenormf";
+    repo = "kakmerge";
+    rev = version;
+    hash = "sha256-DkZaa9qQhxfjuIJYY0MDWhfh8NAsoy7P7f04FK3FGWM=";
+  };
+
+  installPhase = ''
+    install -Dm755 kakmerge $out/bin/kakmerge
+  '';
+}
diff --git a/pkgs/stata/stata.nix b/pkgs/stata/stata.nix
new file mode 100644
index 0000000..5d343a0
--- /dev/null
+++ b/pkgs/stata/stata.nix
@@ -0,0 +1,17 @@
+{ pkgs }:
+with pkgs;
+stdenv.mkDerivation rec {
+  name = "stata-${version}";
+  version = "18";
+  src = requireFile {
+    name = "StataNow18Linux64.tar.gz";
+    url = "";
+    sha256 = "cfc1b872ecf345b2d0b3223ea8529b945b49cf1c0a1be8bd972f1d84fed37511";
+  };
+  installPhase = ''
+    mkdir $out
+    tar -xvf $src -C $out
+    cd $out
+    yes | ./install
+  '';
+}
diff --git a/programs/git.nix b/programs/git.nix
index ad3e74e..4095aee 100644
--- a/programs/git.nix
+++ b/programs/git.nix
@@ -7,6 +7,9 @@
     extraConfig = {
       init.defaultBranch = "main";
       core.editor = "kak";
+      merge.tool = "kakmerge";
+      mergetool.kakmerge.trustExitCode = true;
+      mergetool.kakmerge.cmd = "env LOCAL=\"\${LOCAL}\" BASE=\"\${BASE}\" REMOTE=\"\${REMOTE}\" MERGED=\"\${MERGED}\" kakmerge";
     };
   };