diff --git a/.gitattributes b/.gitattributes
index c9839d64f46a81f0e6e1405448ea22bc531f0a15..3c04f4f99f007a875dd9eca04e9a8e38d9830377 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,6 @@
 *.a binary
+# Default conflict marker size is 7 which causes some of the headings in
+# release-notes.txt to trigger git diff --check: 'leftover conflict marker'
+# when the heading is exactly 7 characters long.
+*.md conflict-marker-size=100
+*.txt conflict-marker-size=100