diff --git a/dot_config/git/attributes b/dot_config/git/attributes
new file mode 100644
index 0000000..1179a64
--- /dev/null
+++ b/dot_config/git/attributes
@@ -0,0 +1,2 @@
+go.sum merge=union
+
diff --git a/dot_config/git/private_config.tmpl b/dot_config/git/private_config.tmpl
index 5989fa4..c012ede 100644
--- a/dot_config/git/private_config.tmpl
+++ b/dot_config/git/private_config.tmpl
@@ -53,7 +53,7 @@
   enabled = true
 [core]
     editor = nvim
-    attributesfile = {{ .chezmoi.homeDir }}/.gitattributes
+    attributesfile = {{ .chezmoi.homeDir }}/.config/git/attributes
     autocrlf = input
 [submodule]
   recurse = true