diff --git a/.github/.kodiak.toml b/.github/.kodiak.toml
new file mode 100644
index 00000000..36263220
--- /dev/null
+++ b/.github/.kodiak.toml
@@ -0,0 +1,2 @@
+version = 1
+merge.notify_on_conflict = false
diff --git a/.kodiak.toml b/.kodiak.toml
deleted file mode 100644
index d9914dfa..00000000
--- a/.kodiak.toml
+++ /dev/null
@@ -1 +0,0 @@
-version = 1