diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..7f4ddd7
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+default.css merge=ours