diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..c6cb591ca
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.toml merge=union
\ No newline at end of file