diff --git a/modules/home-manager/git.nix b/modules/home-manager/git.nix
index 1a556be..0bf69e7 100644
--- a/modules/home-manager/git.nix
+++ b/modules/home-manager/git.nix
@@ -46,6 +46,12 @@ in {
 
     # TODO: https://blog.scottlowe.org/2023/12/15/conditional-git-configuration/
     extraConfig = {
+      init = {
+        defaultBranch = "main";
+      };
+
+      merge.conflictstyle = "zdiff3";
+
       push = {
         autoSetupRemote = true;
       };
diff --git a/nixos/foxtrot.nix b/nixos/foxtrot.nix
index 98dfe4a..c32f8a5 100644
--- a/nixos/foxtrot.nix
+++ b/nixos/foxtrot.nix
@@ -1,9 +1,6 @@
 {
-  flake,
   inputs,
   outputs,
-  # lib,
-  # config,
   pkgs,
   ...
 }: let