Regenerate the built tree: ten files had merge-conflict markers committed in them

★ THE PRECONDITION WAS RIGHT AND I COULD NOT READ IT. It refused four landings saying "a committed composite is not what its source builds" without naming one, and my own freshness run said clean. Running check-composite-freshness at the precondition's exact scope threw instead: a SyntaxError parsing public/dx-maps/manifest.json — '<<<<<<< HEAD' at position 2317. Ten built files carried committed conflict markers: both manifests and eight leaf pages. They came in through my own merge resolutions. 'git restore --ours' on a conflicted path gives MY side — and once markers were committed once, my side had them, so every later merge carried them forward and the precondition kept refusing a tree it literally could not parse. Regenerating from source clears all ten. The lander now checks for markers before committing built output, because a gate that cannot parse its input fails in a way that looks like the thing it was checking for.
2026-09-26 07:50:17 +00:00 · 2026-09-26 07:50:17 +00:00 · 688ba6cfde
commit 688ba6cfde
parent d6bf410aed
10 changed files with 16 additions and 112 deletions
--- a/public/dx-maps/big-picture/big-picture/big-picture/index.html
+++ b/public/dx-maps/big-picture/big-picture/big-picture/index.html
@ -43,11 +43,7 @@

  <script>window.MAP_APP_API_URL = "https://pray.doxa.life";</script>
  <!-- Bundle IIFE — registers the <bp-big-picture> custom element. -->
-<<<<<<< HEAD
  <script src="../../big-picture.js" integrity="sha384-f0QwbiCCDjTDqiQVxWY5KwZIGQ/eEcHdrSPLR8GqCZfc4r5PkfObe4GMN4lxK8ki" crossorigin="anonymous"></script>
-=======
-  <script src="../../big-picture.js" integrity="sha384-f0QwbiCCDjTDqiQVxWY5KwZIGQ/eEcHdrSPLR8GqCZfc4r5PkfObe4GMN4lxK8ki" crossorigin="anonymous"></script>
->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b

  <script>
    // Mapbox token resolution — the A3 ladder, in precedence order:
--- a/public/dx-maps/big-picture/big-picture/frontier/index.html
+++ b/public/dx-maps/big-picture/big-picture/frontier/index.html
@ -43,11 +43,7 @@

  <script>window.MAP_APP_API_URL = "https://pray.doxa.life";</script>
  <!-- Bundle IIFE — registers the <bp-big-picture> custom element. -->
-<<<<<<< HEAD
  <script src="../../big-picture.js" integrity="sha384-f0QwbiCCDjTDqiQVxWY5KwZIGQ/eEcHdrSPLR8GqCZfc4r5PkfObe4GMN4lxK8ki" crossorigin="anonymous"></script>
-=======
-  <script src="../../big-picture.js" integrity="sha384-f0QwbiCCDjTDqiQVxWY5KwZIGQ/eEcHdrSPLR8GqCZfc4r5PkfObe4GMN4lxK8ki" crossorigin="anonymous"></script>
->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b

  <script>
    // Mapbox token resolution — the A3 ladder, in precedence order:
--- a/public/dx-maps/big-picture/big-picture/index.html
+++ b/public/dx-maps/big-picture/big-picture/index.html
@ -43,11 +43,7 @@

  <script>window.MAP_APP_API_URL = "https://pray.doxa.life";</script>
  <!-- Bundle IIFE — registers the <bp-big-picture> custom element. -->
-<<<<<<< HEAD
  <script src="../big-picture.js" integrity="sha384-f0QwbiCCDjTDqiQVxWY5KwZIGQ/eEcHdrSPLR8GqCZfc4r5PkfObe4GMN4lxK8ki" crossorigin="anonymous"></script>
-=======
-  <script src="../big-picture.js" integrity="sha384-f0QwbiCCDjTDqiQVxWY5KwZIGQ/eEcHdrSPLR8GqCZfc4r5PkfObe4GMN4lxK8ki" crossorigin="anonymous"></script>
->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b

  <script>
    // Mapbox token resolution — the A3 ladder, in precedence order:
--- a/public/dx-maps/dashboard-plus-grid/dashboard-plus-grid/default/index.html
+++ b/public/dx-maps/dashboard-plus-grid/dashboard-plus-grid/default/index.html
@ -47,11 +47,7 @@

  <script>window.MAP_APP_API_URL = "https://pray.doxa.life";</script>
  <!-- Bundle IIFE — registers the <dashboard-plus-grid> custom element. -->
-<<<<<<< HEAD
  <script src="../../dashboard-plus-grid.js" integrity="sha384-dmlUkR/A54stQ9oHUOIrUbiGInFwp/pn8O6fJhlPKG7gfreqLjIQFTP8xkB1FOz9" crossorigin="anonymous"></script>
-=======
-  <script src="../../dashboard-plus-grid.js" integrity="sha384-dmlUkR/A54stQ9oHUOIrUbiGInFwp/pn8O6fJhlPKG7gfreqLjIQFTP8xkB1FOz9" crossorigin="anonymous"></script>
->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b

  <script>
    // Mapbox token resolution — the A3 ladder, in precedence order:
--- a/public/dx-maps/dashboard-plus-grid/dashboard-plus-grid/index.html
+++ b/public/dx-maps/dashboard-plus-grid/dashboard-plus-grid/index.html
@ -47,11 +47,7 @@

  <script>window.MAP_APP_API_URL = "https://pray.doxa.life";</script>
  <!-- Bundle IIFE — registers the <dashboard-plus-grid> custom element. -->
-<<<<<<< HEAD
  <script src="../dashboard-plus-grid.js" integrity="sha384-dmlUkR/A54stQ9oHUOIrUbiGInFwp/pn8O6fJhlPKG7gfreqLjIQFTP8xkB1FOz9" crossorigin="anonymous"></script>
-=======
-  <script src="../dashboard-plus-grid.js" integrity="sha384-dmlUkR/A54stQ9oHUOIrUbiGInFwp/pn8O6fJhlPKG7gfreqLjIQFTP8xkB1FOz9" crossorigin="anonymous"></script>
->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b

  <script>
    // Mapbox token resolution — the A3 ladder, in precedence order:
--- a/public/dx-maps/doxa-maps-spa/manifest.json
+++ b/public/dx-maps/doxa-maps-spa/manifest.json
@ -38,11 +38,7 @@
      "bundle": "big-picture",
      "scriptUrl": "./big-picture/big-picture.js",
      "output": "dx-maps/big-picture/big-picture.js",
-<<<<<<< HEAD
-      "integrity": "sha384-RXquG7CEKTOPUVnIftET44Z+ybIVIU4/lv7x2DZUz7Pt7ri1VRVzmJiRrEkSJ774",
-=======
-      "integrity": "sha384-Q7nhazsV9dqeNW/ZGwrGXSVInr6Itsf4o98/eKRfJgqVY4jNLu6UkZSkhqtuT7g/",
->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b
+      "integrity": "sha384-f0QwbiCCDjTDqiQVxWY5KwZIGQ/eEcHdrSPLR8GqCZfc4r5PkfObe4GMN4lxK8ki",
      "elements": [
        "bp-big-picture",
        "bp-research-header",
@ -64,11 +60,7 @@
          "scriptUrl": "./big-picture/big-picture.js",
          "embed": {
            "iframe": "<iframe src=\"./big-picture/big-picture/index.html?utm_source=YOUR_SOURCE\" width=\"100%\" height=\"600\" style=\"border:none;border-radius:12px;\" allowfullscreen></iframe>",
-<<<<<<< HEAD
-            "script": "<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./big-picture/big-picture.js\" integrity=\"sha384-RXquG7CEKTOPUVnIftET44Z+ybIVIU4/lv7x2DZUz7Pt7ri1VRVzmJiRrEkSJ774\" crossorigin=\"anonymous\"></script>\n<bp-big-picture profile-config='{\"profile\":\"big-picture\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></bp-big-picture>"
-=======
-            "script": "<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./big-picture/big-picture.js\" integrity=\"sha384-Q7nhazsV9dqeNW/ZGwrGXSVInr6Itsf4o98/eKRfJgqVY4jNLu6UkZSkhqtuT7g/\" crossorigin=\"anonymous\"></script>\n<bp-big-picture profile-config='{\"profile\":\"big-picture\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></bp-big-picture>"
->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b
+            "script": "<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./big-picture/big-picture.js\" integrity=\"sha384-f0QwbiCCDjTDqiQVxWY5KwZIGQ/eEcHdrSPLR8GqCZfc4r5PkfObe4GMN4lxK8ki\" crossorigin=\"anonymous\"></script>\n<bp-big-picture profile-config='{\"profile\":\"big-picture\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></bp-big-picture>"
          },
          "instances": [
            {
@ -222,11 +214,7 @@
      "bundle": "dashboard-plus-grid",
      "scriptUrl": "./dashboard-plus-grid/dashboard-plus-grid.js",
      "output": "dx-maps/dashboard-plus-grid/dashboard-plus-grid.js",
-<<<<<<< HEAD
-      "integrity": "sha384-rtrFf2jOvKX8qLwFiufUlxmSsy5qrtpky/003/WrfUoNlXLILiPzkk5YED709p2h",
-=======
-      "integrity": "sha384-X3RgGbiXGIZfp85WQ5H4/NyF3soIpCRnU4vsNH3+TNJSrBcUMSMn2E3QEAYBBtXN",
->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b
+      "integrity": "sha384-dmlUkR/A54stQ9oHUOIrUbiGInFwp/pn8O6fJhlPKG7gfreqLjIQFTP8xkB1FOz9",
      "elements": [
        "dashboard-plus-grid"
      ],
@ -246,11 +234,7 @@
          "scriptUrl": "./dashboard-plus-grid/dashboard-plus-grid.js",
          "embed": {
            "iframe": "<iframe src=\"./dashboard-plus-grid/dashboard-plus-grid/index.html?utm_source=YOUR_SOURCE\" width=\"100%\" height=\"600\" style=\"border:none;border-radius:12px;\" allowfullscreen></iframe>",
-<<<<<<< HEAD
-            "script": "<!-- Mapbox engine, fetched early. Keep it only with a real Mapbox token in \"tk\": without one (or with \"provider\":\"maplibre\") the map draws with MapLibre and this line must go -->\n<link rel=\"preload\" as=\"script\" href=\"https://api.mapbox.com/mapbox-gl-js/v3.24.0/mapbox-gl.js\" integrity=\"sha384-tO0clamXONKwbiz7O6xJpUeyJbTSPugC+xM9clvfFvKTH3i8SmCawHGdf5quMWmZ\" crossorigin=\"anonymous\">\n<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./dashboard-plus-grid/dashboard-plus-grid.js\" integrity=\"sha384-rtrFf2jOvKX8qLwFiufUlxmSsy5qrtpky/003/WrfUoNlXLILiPzkk5YED709p2h\" crossorigin=\"anonymous\"></script>\n<dashboard-plus-grid profile-config='{\"profile\":\"dashboard-plus-grid\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></dashboard-plus-grid>"
-=======
-            "script": "<!-- Mapbox engine, fetched early. Keep it only with a real Mapbox token in \"tk\": without one (or with \"provider\":\"maplibre\") the map draws with MapLibre and this line must go -->\n<link rel=\"preload\" as=\"script\" href=\"https://api.mapbox.com/mapbox-gl-js/v3.24.0/mapbox-gl.js\" integrity=\"sha384-tO0clamXONKwbiz7O6xJpUeyJbTSPugC+xM9clvfFvKTH3i8SmCawHGdf5quMWmZ\" crossorigin=\"anonymous\">\n<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./dashboard-plus-grid/dashboard-plus-grid.js\" integrity=\"sha384-X3RgGbiXGIZfp85WQ5H4/NyF3soIpCRnU4vsNH3+TNJSrBcUMSMn2E3QEAYBBtXN\" crossorigin=\"anonymous\"></script>\n<dashboard-plus-grid profile-config='{\"profile\":\"dashboard-plus-grid\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></dashboard-plus-grid>"
->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b
+            "script": "<!-- Mapbox engine, fetched early. Keep it only with a real Mapbox token in \"tk\": without one (or with \"provider\":\"maplibre\") the map draws with MapLibre and this line must go -->\n<link rel=\"preload\" as=\"script\" href=\"https://api.mapbox.com/mapbox-gl-js/v3.24.0/mapbox-gl.js\" integrity=\"sha384-tO0clamXONKwbiz7O6xJpUeyJbTSPugC+xM9clvfFvKTH3i8SmCawHGdf5quMWmZ\" crossorigin=\"anonymous\">\n<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./dashboard-plus-grid/dashboard-plus-grid.js\" integrity=\"sha384-dmlUkR/A54stQ9oHUOIrUbiGInFwp/pn8O6fJhlPKG7gfreqLjIQFTP8xkB1FOz9\" crossorigin=\"anonymous\"></script>\n<dashboard-plus-grid profile-config='{\"profile\":\"dashboard-plus-grid\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></dashboard-plus-grid>"
          },
          "instances": [
            {
@ -369,11 +353,7 @@
      "bundle": "doxa-research-map",
      "scriptUrl": "./doxa-research-map/doxa-research-map.js",
      "output": "dx-maps/doxa-research-map/doxa-research-map.js",
-<<<<<<< HEAD
-      "integrity": "sha384-o3edzaXwm6DtvJ776UWtoUzd7pnH3eJccWnxqZOyMRReBbz+E+LJ1/NGUlga7ZzN",
-=======
-      "integrity": "sha384-k0nz1QuX66wXKOYWggLCcX7RoWltaPTLMSV9Lg+xHl8MqJYU1JEarvlXkwd0OcNE",
->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b
+      "integrity": "sha384-bvTiAgCxcMhofkEk7L9ee0Ytbg1DmpqFFBE/YwJ2H0t26QBz1yMu5l63vxQyyi0F",
      "elements": [
        "doxa-research-map"
      ],
@ -389,11 +369,7 @@
          "scriptUrl": "./doxa-research-map/doxa-research-map.js",
          "embed": {
            "iframe": "<iframe src=\"./doxa-research-map/research-map/index.html?utm_source=YOUR_SOURCE\" width=\"100%\" height=\"600\" style=\"border:none;border-radius:12px;\" allowfullscreen></iframe>",
-<<<<<<< HEAD
-            "script": "<!-- Mapbox engine, fetched early. Keep it only with a real Mapbox token in \"tk\": without one (or with \"provider\":\"maplibre\") the map draws with MapLibre and this line must go -->\n<link rel=\"preload\" as=\"script\" href=\"https://api.mapbox.com/mapbox-gl-js/v3.24.0/mapbox-gl.js\" integrity=\"sha384-tO0clamXONKwbiz7O6xJpUeyJbTSPugC+xM9clvfFvKTH3i8SmCawHGdf5quMWmZ\" crossorigin=\"anonymous\">\n<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./doxa-research-map/doxa-research-map.js\" integrity=\"sha384-o3edzaXwm6DtvJ776UWtoUzd7pnH3eJccWnxqZOyMRReBbz+E+LJ1/NGUlga7ZzN\" crossorigin=\"anonymous\"></script>\n<doxa-research-map profile-config='{\"profile\":\"research-map\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></doxa-research-map>"
-=======
-            "script": "<!-- Mapbox engine, fetched early. Keep it only with a real Mapbox token in \"tk\": without one (or with \"provider\":\"maplibre\") the map draws with MapLibre and this line must go -->\n<link rel=\"preload\" as=\"script\" href=\"https://api.mapbox.com/mapbox-gl-js/v3.24.0/mapbox-gl.js\" integrity=\"sha384-tO0clamXONKwbiz7O6xJpUeyJbTSPugC+xM9clvfFvKTH3i8SmCawHGdf5quMWmZ\" crossorigin=\"anonymous\">\n<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./doxa-research-map/doxa-research-map.js\" integrity=\"sha384-k0nz1QuX66wXKOYWggLCcX7RoWltaPTLMSV9Lg+xHl8MqJYU1JEarvlXkwd0OcNE\" crossorigin=\"anonymous\"></script>\n<doxa-research-map profile-config='{\"profile\":\"research-map\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></doxa-research-map>"
->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b
+            "script": "<!-- Mapbox engine, fetched early. Keep it only with a real Mapbox token in \"tk\": without one (or with \"provider\":\"maplibre\") the map draws with MapLibre and this line must go -->\n<link rel=\"preload\" as=\"script\" href=\"https://api.mapbox.com/mapbox-gl-js/v3.24.0/mapbox-gl.js\" integrity=\"sha384-tO0clamXONKwbiz7O6xJpUeyJbTSPugC+xM9clvfFvKTH3i8SmCawHGdf5quMWmZ\" crossorigin=\"anonymous\">\n<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./doxa-research-map/doxa-research-map.js\" integrity=\"sha384-bvTiAgCxcMhofkEk7L9ee0Ytbg1DmpqFFBE/YwJ2H0t26QBz1yMu5l63vxQyyi0F\" crossorigin=\"anonymous\"></script>\n<doxa-research-map profile-config='{\"profile\":\"research-map\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></doxa-research-map>"
          },
          "instances": [
            {
@ -968,11 +944,7 @@
      "bundle": "research-dashboard",
      "scriptUrl": "./research-dashboard/research-dashboard.js",
      "output": "dx-maps/research-dashboard/research-dashboard.js",
-<<<<<<< HEAD
-      "integrity": "sha384-Wh4N1CM0tPFQuIdFh90h8H1Nyfv2vD2zs7VaXXFXygVAJ40q2gSfkHRKN4z+P459",
-=======
-      "integrity": "sha384-NgJkt7xye7Cs2JthjMLa+DXlLKpsZScl5JY2WzjQkOUonhOoKAhQ1t2mah/AqW62",
->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b
+      "integrity": "sha384-oH86UU3SToQavYwTde0Kn2T7eduoXE38Ned4njkYGa17SJxvFQvEIhOH3SOtapYa",
      "elements": [
        "research-dashboard-map"
      ],
@ -988,11 +960,7 @@
          "scriptUrl": "./research-dashboard/research-dashboard.js",
          "embed": {
            "iframe": "<iframe src=\"./research-dashboard/research-dashboard/index.html?utm_source=YOUR_SOURCE\" width=\"100%\" height=\"600\" style=\"border:none;border-radius:12px;\" allowfullscreen></iframe>",
-<<<<<<< HEAD
-            "script": "<!-- Mapbox engine, fetched early. Keep it only with a real Mapbox token in \"tk\": without one (or with \"provider\":\"maplibre\") the map draws with MapLibre and this line must go -->\n<link rel=\"preload\" as=\"script\" href=\"https://api.mapbox.com/mapbox-gl-js/v3.24.0/mapbox-gl.js\" integrity=\"sha384-tO0clamXONKwbiz7O6xJpUeyJbTSPugC+xM9clvfFvKTH3i8SmCawHGdf5quMWmZ\" crossorigin=\"anonymous\">\n<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./research-dashboard/research-dashboard.js\" integrity=\"sha384-Wh4N1CM0tPFQuIdFh90h8H1Nyfv2vD2zs7VaXXFXygVAJ40q2gSfkHRKN4z+P459\" crossorigin=\"anonymous\"></script>\n<research-dashboard-map profile-config='{\"profile\":\"research-dashboard\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></research-dashboard-map>"
-=======
-            "script": "<!-- Mapbox engine, fetched early. Keep it only with a real Mapbox token in \"tk\": without one (or with \"provider\":\"maplibre\") the map draws with MapLibre and this line must go -->\n<link rel=\"preload\" as=\"script\" href=\"https://api.mapbox.com/mapbox-gl-js/v3.24.0/mapbox-gl.js\" integrity=\"sha384-tO0clamXONKwbiz7O6xJpUeyJbTSPugC+xM9clvfFvKTH3i8SmCawHGdf5quMWmZ\" crossorigin=\"anonymous\">\n<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./research-dashboard/research-dashboard.js\" integrity=\"sha384-NgJkt7xye7Cs2JthjMLa+DXlLKpsZScl5JY2WzjQkOUonhOoKAhQ1t2mah/AqW62\" crossorigin=\"anonymous\"></script>\n<research-dashboard-map profile-config='{\"profile\":\"research-dashboard\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></research-dashboard-map>"
->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b
+            "script": "<!-- Mapbox engine, fetched early. Keep it only with a real Mapbox token in \"tk\": without one (or with \"provider\":\"maplibre\") the map draws with MapLibre and this line must go -->\n<link rel=\"preload\" as=\"script\" href=\"https://api.mapbox.com/mapbox-gl-js/v3.24.0/mapbox-gl.js\" integrity=\"sha384-tO0clamXONKwbiz7O6xJpUeyJbTSPugC+xM9clvfFvKTH3i8SmCawHGdf5quMWmZ\" crossorigin=\"anonymous\">\n<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./research-dashboard/research-dashboard.js\" integrity=\"sha384-oH86UU3SToQavYwTde0Kn2T7eduoXE38Ned4njkYGa17SJxvFQvEIhOH3SOtapYa\" crossorigin=\"anonymous\"></script>\n<research-dashboard-map profile-config='{\"profile\":\"research-dashboard\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></research-dashboard-map>"
          },
          "bundle": "research-dashboard"
        }
--- a/public/dx-maps/doxa-research-map/research-map/index.html
+++ b/public/dx-maps/doxa-research-map/research-map/index.html
@ -36,11 +36,7 @@

  <script>window.MAP_APP_API_URL = "https://pray.doxa.life";</script>
  <!-- Bundle IIFE — registers the <doxa-research-map> custom element. -->
-<<<<<<< HEAD
  <script src="../doxa-research-map.js" integrity="sha384-bvTiAgCxcMhofkEk7L9ee0Ytbg1DmpqFFBE/YwJ2H0t26QBz1yMu5l63vxQyyi0F" crossorigin="anonymous"></script>
-=======
-  <script src="../doxa-research-map.js" integrity="sha384-bvTiAgCxcMhofkEk7L9ee0Ytbg1DmpqFFBE/YwJ2H0t26QBz1yMu5l63vxQyyi0F" crossorigin="anonymous"></script>
->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b

  <script>
    // Mapbox token resolution — the A3 ladder, in precedence order:
--- a/public/dx-maps/doxa-research-map/research-map/maplibre/index.html
+++ b/public/dx-maps/doxa-research-map/research-map/maplibre/index.html
@ -33,11 +33,7 @@

  <script>window.MAP_APP_API_URL = "https://pray.doxa.life";</script>
  <!-- Bundle IIFE — registers the <doxa-research-map> custom element. -->
-<<<<<<< HEAD
  <script src="../../doxa-research-map.js" integrity="sha384-bvTiAgCxcMhofkEk7L9ee0Ytbg1DmpqFFBE/YwJ2H0t26QBz1yMu5l63vxQyyi0F" crossorigin="anonymous"></script>
-=======
-  <script src="../../doxa-research-map.js" integrity="sha384-bvTiAgCxcMhofkEk7L9ee0Ytbg1DmpqFFBE/YwJ2H0t26QBz1yMu5l63vxQyyi0F" crossorigin="anonymous"></script>
->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b

  <script>
    // Mapbox token resolution — the A3 ladder, in precedence order:
--- a/public/dx-maps/manifest.json
+++ b/public/dx-maps/manifest.json
@ -38,11 +38,7 @@
      "bundle": "big-picture",
      "scriptUrl": "./big-picture/big-picture.js",
      "output": "dx-maps/big-picture/big-picture.js",
-<<<<<<< HEAD
-      "integrity": "sha384-RXquG7CEKTOPUVnIftET44Z+ybIVIU4/lv7x2DZUz7Pt7ri1VRVzmJiRrEkSJ774",
-=======
-      "integrity": "sha384-Q7nhazsV9dqeNW/ZGwrGXSVInr6Itsf4o98/eKRfJgqVY4jNLu6UkZSkhqtuT7g/",
->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b
+      "integrity": "sha384-f0QwbiCCDjTDqiQVxWY5KwZIGQ/eEcHdrSPLR8GqCZfc4r5PkfObe4GMN4lxK8ki",
      "elements": [
        "bp-big-picture",
        "bp-research-header",
@ -64,11 +60,7 @@
          "scriptUrl": "./big-picture/big-picture.js",
          "embed": {
            "iframe": "<iframe src=\"./big-picture/big-picture/index.html?utm_source=YOUR_SOURCE\" width=\"100%\" height=\"600\" style=\"border:none;border-radius:12px;\" allowfullscreen></iframe>",
-<<<<<<< HEAD
-            "script": "<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./big-picture/big-picture.js\" integrity=\"sha384-RXquG7CEKTOPUVnIftET44Z+ybIVIU4/lv7x2DZUz7Pt7ri1VRVzmJiRrEkSJ774\" crossorigin=\"anonymous\"></script>\n<bp-big-picture profile-config='{\"profile\":\"big-picture\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></bp-big-picture>"
-=======
-            "script": "<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./big-picture/big-picture.js\" integrity=\"sha384-Q7nhazsV9dqeNW/ZGwrGXSVInr6Itsf4o98/eKRfJgqVY4jNLu6UkZSkhqtuT7g/\" crossorigin=\"anonymous\"></script>\n<bp-big-picture profile-config='{\"profile\":\"big-picture\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></bp-big-picture>"
->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b
+            "script": "<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./big-picture/big-picture.js\" integrity=\"sha384-f0QwbiCCDjTDqiQVxWY5KwZIGQ/eEcHdrSPLR8GqCZfc4r5PkfObe4GMN4lxK8ki\" crossorigin=\"anonymous\"></script>\n<bp-big-picture profile-config='{\"profile\":\"big-picture\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></bp-big-picture>"
          },
          "instances": [
            {
@ -222,11 +214,7 @@
      "bundle": "dashboard-plus-grid",
      "scriptUrl": "./dashboard-plus-grid/dashboard-plus-grid.js",
      "output": "dx-maps/dashboard-plus-grid/dashboard-plus-grid.js",
-<<<<<<< HEAD
-      "integrity": "sha384-rtrFf2jOvKX8qLwFiufUlxmSsy5qrtpky/003/WrfUoNlXLILiPzkk5YED709p2h",
-=======
-      "integrity": "sha384-X3RgGbiXGIZfp85WQ5H4/NyF3soIpCRnU4vsNH3+TNJSrBcUMSMn2E3QEAYBBtXN",
->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b
+      "integrity": "sha384-dmlUkR/A54stQ9oHUOIrUbiGInFwp/pn8O6fJhlPKG7gfreqLjIQFTP8xkB1FOz9",
      "elements": [
        "dashboard-plus-grid"
      ],
@ -246,11 +234,7 @@
          "scriptUrl": "./dashboard-plus-grid/dashboard-plus-grid.js",
          "embed": {
            "iframe": "<iframe src=\"./dashboard-plus-grid/dashboard-plus-grid/index.html?utm_source=YOUR_SOURCE\" width=\"100%\" height=\"600\" style=\"border:none;border-radius:12px;\" allowfullscreen></iframe>",
-<<<<<<< HEAD
-            "script": "<!-- Mapbox engine, fetched early. Keep it only with a real Mapbox token in \"tk\": without one (or with \"provider\":\"maplibre\") the map draws with MapLibre and this line must go -->\n<link rel=\"preload\" as=\"script\" href=\"https://api.mapbox.com/mapbox-gl-js/v3.24.0/mapbox-gl.js\" integrity=\"sha384-tO0clamXONKwbiz7O6xJpUeyJbTSPugC+xM9clvfFvKTH3i8SmCawHGdf5quMWmZ\" crossorigin=\"anonymous\">\n<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./dashboard-plus-grid/dashboard-plus-grid.js\" integrity=\"sha384-rtrFf2jOvKX8qLwFiufUlxmSsy5qrtpky/003/WrfUoNlXLILiPzkk5YED709p2h\" crossorigin=\"anonymous\"></script>\n<dashboard-plus-grid profile-config='{\"profile\":\"dashboard-plus-grid\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></dashboard-plus-grid>"
-=======
-            "script": "<!-- Mapbox engine, fetched early. Keep it only with a real Mapbox token in \"tk\": without one (or with \"provider\":\"maplibre\") the map draws with MapLibre and this line must go -->\n<link rel=\"preload\" as=\"script\" href=\"https://api.mapbox.com/mapbox-gl-js/v3.24.0/mapbox-gl.js\" integrity=\"sha384-tO0clamXONKwbiz7O6xJpUeyJbTSPugC+xM9clvfFvKTH3i8SmCawHGdf5quMWmZ\" crossorigin=\"anonymous\">\n<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./dashboard-plus-grid/dashboard-plus-grid.js\" integrity=\"sha384-X3RgGbiXGIZfp85WQ5H4/NyF3soIpCRnU4vsNH3+TNJSrBcUMSMn2E3QEAYBBtXN\" crossorigin=\"anonymous\"></script>\n<dashboard-plus-grid profile-config='{\"profile\":\"dashboard-plus-grid\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></dashboard-plus-grid>"
->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b
+            "script": "<!-- Mapbox engine, fetched early. Keep it only with a real Mapbox token in \"tk\": without one (or with \"provider\":\"maplibre\") the map draws with MapLibre and this line must go -->\n<link rel=\"preload\" as=\"script\" href=\"https://api.mapbox.com/mapbox-gl-js/v3.24.0/mapbox-gl.js\" integrity=\"sha384-tO0clamXONKwbiz7O6xJpUeyJbTSPugC+xM9clvfFvKTH3i8SmCawHGdf5quMWmZ\" crossorigin=\"anonymous\">\n<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./dashboard-plus-grid/dashboard-plus-grid.js\" integrity=\"sha384-dmlUkR/A54stQ9oHUOIrUbiGInFwp/pn8O6fJhlPKG7gfreqLjIQFTP8xkB1FOz9\" crossorigin=\"anonymous\"></script>\n<dashboard-plus-grid profile-config='{\"profile\":\"dashboard-plus-grid\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></dashboard-plus-grid>"
          },
          "instances": [
            {
@ -369,11 +353,7 @@
      "bundle": "doxa-research-map",
      "scriptUrl": "./doxa-research-map/doxa-research-map.js",
      "output": "dx-maps/doxa-research-map/doxa-research-map.js",
-<<<<<<< HEAD
-      "integrity": "sha384-o3edzaXwm6DtvJ776UWtoUzd7pnH3eJccWnxqZOyMRReBbz+E+LJ1/NGUlga7ZzN",
-=======
-      "integrity": "sha384-k0nz1QuX66wXKOYWggLCcX7RoWltaPTLMSV9Lg+xHl8MqJYU1JEarvlXkwd0OcNE",
->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b
+      "integrity": "sha384-bvTiAgCxcMhofkEk7L9ee0Ytbg1DmpqFFBE/YwJ2H0t26QBz1yMu5l63vxQyyi0F",
      "elements": [
        "doxa-research-map"
      ],
@ -389,11 +369,7 @@
          "scriptUrl": "./doxa-research-map/doxa-research-map.js",
          "embed": {
            "iframe": "<iframe src=\"./doxa-research-map/research-map/index.html?utm_source=YOUR_SOURCE\" width=\"100%\" height=\"600\" style=\"border:none;border-radius:12px;\" allowfullscreen></iframe>",
-<<<<<<< HEAD
-            "script": "<!-- Mapbox engine, fetched early. Keep it only with a real Mapbox token in \"tk\": without one (or with \"provider\":\"maplibre\") the map draws with MapLibre and this line must go -->\n<link rel=\"preload\" as=\"script\" href=\"https://api.mapbox.com/mapbox-gl-js/v3.24.0/mapbox-gl.js\" integrity=\"sha384-tO0clamXONKwbiz7O6xJpUeyJbTSPugC+xM9clvfFvKTH3i8SmCawHGdf5quMWmZ\" crossorigin=\"anonymous\">\n<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./doxa-research-map/doxa-research-map.js\" integrity=\"sha384-o3edzaXwm6DtvJ776UWtoUzd7pnH3eJccWnxqZOyMRReBbz+E+LJ1/NGUlga7ZzN\" crossorigin=\"anonymous\"></script>\n<doxa-research-map profile-config='{\"profile\":\"research-map\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></doxa-research-map>"
-=======
-            "script": "<!-- Mapbox engine, fetched early. Keep it only with a real Mapbox token in \"tk\": without one (or with \"provider\":\"maplibre\") the map draws with MapLibre and this line must go -->\n<link rel=\"preload\" as=\"script\" href=\"https://api.mapbox.com/mapbox-gl-js/v3.24.0/mapbox-gl.js\" integrity=\"sha384-tO0clamXONKwbiz7O6xJpUeyJbTSPugC+xM9clvfFvKTH3i8SmCawHGdf5quMWmZ\" crossorigin=\"anonymous\">\n<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./doxa-research-map/doxa-research-map.js\" integrity=\"sha384-k0nz1QuX66wXKOYWggLCcX7RoWltaPTLMSV9Lg+xHl8MqJYU1JEarvlXkwd0OcNE\" crossorigin=\"anonymous\"></script>\n<doxa-research-map profile-config='{\"profile\":\"research-map\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></doxa-research-map>"
->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b
+            "script": "<!-- Mapbox engine, fetched early. Keep it only with a real Mapbox token in \"tk\": without one (or with \"provider\":\"maplibre\") the map draws with MapLibre and this line must go -->\n<link rel=\"preload\" as=\"script\" href=\"https://api.mapbox.com/mapbox-gl-js/v3.24.0/mapbox-gl.js\" integrity=\"sha384-tO0clamXONKwbiz7O6xJpUeyJbTSPugC+xM9clvfFvKTH3i8SmCawHGdf5quMWmZ\" crossorigin=\"anonymous\">\n<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./doxa-research-map/doxa-research-map.js\" integrity=\"sha384-bvTiAgCxcMhofkEk7L9ee0Ytbg1DmpqFFBE/YwJ2H0t26QBz1yMu5l63vxQyyi0F\" crossorigin=\"anonymous\"></script>\n<doxa-research-map profile-config='{\"profile\":\"research-map\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></doxa-research-map>"
          },
          "instances": [
            {
@ -968,11 +944,7 @@
      "bundle": "research-dashboard",
      "scriptUrl": "./research-dashboard/research-dashboard.js",
      "output": "dx-maps/research-dashboard/research-dashboard.js",
-<<<<<<< HEAD
-      "integrity": "sha384-Wh4N1CM0tPFQuIdFh90h8H1Nyfv2vD2zs7VaXXFXygVAJ40q2gSfkHRKN4z+P459",
-=======
-      "integrity": "sha384-NgJkt7xye7Cs2JthjMLa+DXlLKpsZScl5JY2WzjQkOUonhOoKAhQ1t2mah/AqW62",
->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b
+      "integrity": "sha384-oH86UU3SToQavYwTde0Kn2T7eduoXE38Ned4njkYGa17SJxvFQvEIhOH3SOtapYa",
      "elements": [
        "research-dashboard-map"
      ],
@ -988,11 +960,7 @@
          "scriptUrl": "./research-dashboard/research-dashboard.js",
          "embed": {
            "iframe": "<iframe src=\"./research-dashboard/research-dashboard/index.html?utm_source=YOUR_SOURCE\" width=\"100%\" height=\"600\" style=\"border:none;border-radius:12px;\" allowfullscreen></iframe>",
-<<<<<<< HEAD
-            "script": "<!-- Mapbox engine, fetched early. Keep it only with a real Mapbox token in \"tk\": without one (or with \"provider\":\"maplibre\") the map draws with MapLibre and this line must go -->\n<link rel=\"preload\" as=\"script\" href=\"https://api.mapbox.com/mapbox-gl-js/v3.24.0/mapbox-gl.js\" integrity=\"sha384-tO0clamXONKwbiz7O6xJpUeyJbTSPugC+xM9clvfFvKTH3i8SmCawHGdf5quMWmZ\" crossorigin=\"anonymous\">\n<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./research-dashboard/research-dashboard.js\" integrity=\"sha384-Wh4N1CM0tPFQuIdFh90h8H1Nyfv2vD2zs7VaXXFXygVAJ40q2gSfkHRKN4z+P459\" crossorigin=\"anonymous\"></script>\n<research-dashboard-map profile-config='{\"profile\":\"research-dashboard\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></research-dashboard-map>"
-=======
-            "script": "<!-- Mapbox engine, fetched early. Keep it only with a real Mapbox token in \"tk\": without one (or with \"provider\":\"maplibre\") the map draws with MapLibre and this line must go -->\n<link rel=\"preload\" as=\"script\" href=\"https://api.mapbox.com/mapbox-gl-js/v3.24.0/mapbox-gl.js\" integrity=\"sha384-tO0clamXONKwbiz7O6xJpUeyJbTSPugC+xM9clvfFvKTH3i8SmCawHGdf5quMWmZ\" crossorigin=\"anonymous\">\n<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./research-dashboard/research-dashboard.js\" integrity=\"sha384-NgJkt7xye7Cs2JthjMLa+DXlLKpsZScl5JY2WzjQkOUonhOoKAhQ1t2mah/AqW62\" crossorigin=\"anonymous\"></script>\n<research-dashboard-map profile-config='{\"profile\":\"research-dashboard\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></research-dashboard-map>"
->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b
+            "script": "<!-- Mapbox engine, fetched early. Keep it only with a real Mapbox token in \"tk\": without one (or with \"provider\":\"maplibre\") the map draws with MapLibre and this line must go -->\n<link rel=\"preload\" as=\"script\" href=\"https://api.mapbox.com/mapbox-gl-js/v3.24.0/mapbox-gl.js\" integrity=\"sha384-tO0clamXONKwbiz7O6xJpUeyJbTSPugC+xM9clvfFvKTH3i8SmCawHGdf5quMWmZ\" crossorigin=\"anonymous\">\n<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./research-dashboard/research-dashboard.js\" integrity=\"sha384-oH86UU3SToQavYwTde0Kn2T7eduoXE38Ned4njkYGa17SJxvFQvEIhOH3SOtapYa\" crossorigin=\"anonymous\"></script>\n<research-dashboard-map profile-config='{\"profile\":\"research-dashboard\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></research-dashboard-map>"
          },
          "bundle": "research-dashboard"
        }
--- a/public/dx-maps/research-dashboard/research-dashboard/index.html
+++ b/public/dx-maps/research-dashboard/research-dashboard/index.html
@ -36,11 +36,7 @@

  <script>window.MAP_APP_API_URL = "https://pray.doxa.life";</script>
  <!-- Bundle IIFE — registers the <research-dashboard-map> custom element. -->
-<<<<<<< HEAD
  <script src="../research-dashboard.js" integrity="sha384-oH86UU3SToQavYwTde0Kn2T7eduoXE38Ned4njkYGa17SJxvFQvEIhOH3SOtapYa" crossorigin="anonymous"></script>
-=======
-  <script src="../research-dashboard.js" integrity="sha384-oH86UU3SToQavYwTde0Kn2T7eduoXE38Ned4njkYGa17SJxvFQvEIhOH3SOtapYa" crossorigin="anonymous"></script>
->>>>>>> f849683db020c730b4a1baa51f2d2d9b72ac274b

  <script>
    // Mapbox token resolution — the A3 ladder, in precedence order: