diff --git a/.gitattributes b/.gitattributes
index a790f47a5c3fce0f58e77209bed63ffb8b546b35..2f699ce787e3e854d5204ce0e910942ea8e8196d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -14,4 +14,6 @@ pre-commit       crlf=input
 *.txt            whitespace=tab-in-indent
 *.cmake          whitespace=tab-in-indent
 
+*.md             whitespace=tab-in-indent conflict-marker-size=30
+
 /ThirdParty/sqlite/vtksqlite/vtk_sqlite3.c hooks.MaxObjectKiB=4096