diff --git a/.gitattributes b/.gitattributes
index 03e5e1237f3..44875fd4750 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,7 +1,2 @@
-# GitHub Linguist annotations.
-# Hide nix/.stack.nix/*.nix
-# That is stuff that is generated by nix-tools stack-to-nix
-
-nix/.stack.nix/*.nix linguist-generated=true
-.stack-to-nix.cache linguist-generated=true
-nix/.stack-pkgs.nix linguist-generated=true
+# In changelogs, take lines from both versions, instead of leaving conflict markers
+CHANGELOG.md merge=union