diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..660acec
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+flake.lock merge=ignore
diff --git a/users/profiles/git.nix b/users/profiles/git.nix
index 8e0a04f..ebb559b 100644
--- a/users/profiles/git.nix
+++ b/users/profiles/git.nix
@@ -4,6 +4,7 @@
 
     extraConfig = {
       pull.rebase = true;
+      merge.ignore.driver = "true";
     };
 
     aliases = {