diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5fb3c746f2..96c19ebc6f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ did not actually use any noncompliant cookie names or values, so there was no vu
 * It's possible now to target the HMR build when registering via `template.append` and `template.prepend`. Use `when: 'hmr:public'` or `when: 'hmr:apos'` that will be evaluated against the current asset `options.hmr` configuration.
 * Adds asset module option `options.modulePreloadPolyfill` (default `true`) to allow disabling the polyfill preload for e.g. external front-ends. 
 * Adds `bundleMarkup` to the data sent to the external front-end, containing all markup for injecting Apostrophe UI in the front-end.
+* Warns users when two page types shares the same field name, but has a different type. This may cause errors or other problems when an editor switches page types.
 
 ### Changes
 
diff --git a/modules/@apostrophecms/page/index.js b/modules/@apostrophecms/page/index.js
index 17685dbc2f..ddb477da4a 100644
--- a/modules/@apostrophecms/page/index.js
+++ b/modules/@apostrophecms/page/index.js
@@ -925,7 +925,7 @@ module.exports = {
             for (const right of self.typeChoices) {
               const diff = compareSchema(left, right);
               if (diff.size) {
-                self.apos.util.warnDev(`The page type "${left.name}" has a conflict with "${right.name}" (${formatDiff(diff)})`);
+                self.apos.util.warnDev(`The page type "${left.name}" has a conflict with "${right.name}" (${formatDiff(diff)}). This may cause errors or other problems when an editor switches page types.`);
               }
             }
           }