diff --git a/modules/module-list.nix b/modules/module-list.nix
index 1e3ec7217..254e40202 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -1 +1,2 @@
+# ON MERGE CONFLICT: remove this file when updating to the use of digga.lib.importModules in flake.nix: importModules knows how to rakes leaves by walking the file tree on its own. see commit: https://git.io/JB1Wk
 [ ]
diff --git a/users/modules/module-list.nix b/users/modules/module-list.nix
index 1e3ec7217..254e40202 100644
--- a/users/modules/module-list.nix
+++ b/users/modules/module-list.nix
@@ -1 +1,2 @@
+# ON MERGE CONFLICT: remove this file when updating to the use of digga.lib.importModules in flake.nix: importModules knows how to rakes leaves by walking the file tree on its own. see commit: https://git.io/JB1Wk
 [ ]