diff --git a/packages/cli/src/lifecycles/graph.js b/packages/cli/src/lifecycles/graph.js
index 57b53b7bc..5334c8ff1 100644
--- a/packages/cli/src/lifecycles/graph.js
+++ b/packages/cli/src/lifecycles/graph.js
@@ -206,9 +206,14 @@ const generateGraph = async (compilation) => {
              * template: page template to use as a base for a generated component
              * title: a default value that can be used for <title></title>
              * isSSR: if this is a server side route
+<<<<<<< HEAD
              * prerender: if this should be statically exported
              * isolation: if this should be run in isolated mode
              * hydration: if this page needs hydration support
+=======
+             * prerednder: if this should be statically exported
+             * isolation: if this should be run in isolated mode
+>>>>>>> 55f36b76 (feature/discussion 1117 Isolation Mode (v1) (#1206))
              */
             pages.push({
               data: customData || {},