diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..a19ade0
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+CHANGELOG.md merge=union
diff --git a/.gitignore b/.gitignore
index a347378..8956403 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@ _build/
 ?
 ?.*
 ~*
+
+# Environments
+.envrc