diff --git a/Html/.gitattributes b/Html/.gitattributes
new file mode 100644
index 0000000..4bbccce
--- /dev/null
+++ b/Html/.gitattributes
@@ -0,0 +1 @@
+Html/config.ini merge=ours
\ No newline at end of file