diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000000..9b659e8dac9
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+hack/verify-flags/known-flags.txt merge=union
+test/test_owners.csv merge=union
diff --git a/hack/verify-flags/.gitattributes b/hack/verify-flags/.gitattributes
deleted file mode 100644
index c04e4626951..00000000000
--- a/hack/verify-flags/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-known-flags.txt merge=union
diff --git a/test/.gitattributes b/test/.gitattributes
deleted file mode 100644
index 1b6e6a1a425..00000000000
--- a/test/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-test_owners.csv merge=union