diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..dafc81f
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+.idea/** merge=ignore
\ No newline at end of file