diff --git a/.gitattributes b/.gitattributes
index 4950eb3f9..3bce338ce 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,5 @@
 # Set the default behavior for correcting line endings, 
 # in case people don't have core.autocrlf set.
 * text=auto
-
+.github/workflows/update_from_nginx_documentation.yml merge=ours
+.gitattributes merge=ours