diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..b3a7654
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+data/themes.yml  merge=union