diff --git a/modules/shell/git/home.nix b/modules/shell/git/home.nix
index 1085b05..b745594 100644
--- a/modules/shell/git/home.nix
+++ b/modules/shell/git/home.nix
@@ -10,9 +10,6 @@
     userName = "Glen Goodwin";
     userEmail = "glen.goodwin1992@gmail.com";
     extraConfig = {
-      merge = {
-        ff = "only";
-      };
       diff = {
         algorithm = "patience";
         compactionHeuristic = "true";