diff --git a/internal/check-gospel-whiteboard.mjs b/internal/check-gospel-whiteboard.mjs
index 4659b4b5a..2b40d0b27 100644
--- a/internal/check-gospel-whiteboard.mjs
+++ b/internal/check-gospel-whiteboard.mjs
@@ -23,10 +23,10 @@
  * extentFraction. A consumer cannot buy headroom against the clamp by choosing a bigger extent,
  * and one assertion covers every chart.
  */
-import { layoutBoundedSet } from '../plugin-designs/gospel-internet/src/boundedSet.js'
+import { layoutBoundedSet } from '../library/components/charts/boundedSet.js'
 import { degreesToPixelRadius, dishRadiusDegrees, toFeatureCollection, centeredSetFeatures }
   from '../plugin-designs/gospel-internet/src/setChartFeatures.js'
-import { layoutCenteredSet, ringRadii } from '../plugin-designs/gospel-internet/src/centeredSet.js'
+import { layoutCenteredSet, ringRadii } from '../library/components/charts/centeredSet.js'
 import { whiteboardProjection } from '../library/maps/whiteboard-projection.js'
 
 const fail = []
diff --git a/plugin-designs/gospel-internet/src/components/GiBoundedSet.vue b/plugin-designs/gospel-internet/src/components/GiBoundedSet.vue
index 5f4777e1a..6a7951514 100644
--- a/plugin-designs/gospel-internet/src/components/GiBoundedSet.vue
+++ b/plugin-designs/gospel-internet/src/components/GiBoundedSet.vue
@@ -5,7 +5,7 @@
  * The chart makes exactly one claim — which side of the line a group is on — so position
  * carries no other meaning: no gradient, no ranking, no distance. The centered-set target
  * is the chart that makes the opposite claim, and keeping them visually distinct is the
- * point of having both. Layout maths is in ../boundedSet.js, pure and testable without
+ * point of having both. Layout maths is in @map/components/charts/boundedSet.js, pure and testable without
  * mounting this.
  *
  * SVG RATHER THAN THE MAP ENGINE, which is the opposite of GiTree's call and for a reason
@@ -28,12 +28,8 @@ import { formatCount } from '@map/utils/formatCount.js'
 import { useBoardState } from '../useBoard.js'
 import { useGiT } from '../useGiT.js'
 import { loadNearRows, indexFor } from '../nearRows.js'
-<<<<<<< HEAD
 import { layoutBoundedSet, boundedSetTally } from '@map/components/charts/boundedSet.js'
-=======
-import { layoutBoundedSet, boundedSetTally } from '../boundedSet.js'
 import GiBoundedSetMap from './GiBoundedSetMap.vue'
->>>>>>> ea8dbe45 (Put the bounded set on the whiteboard too, with its boundary in map units)
 
 const T = useGiT()
 const board = useBoardState()
diff --git a/plugin-designs/gospel-internet/src/components/GiBoundedSetMap.vue b/plugin-designs/gospel-internet/src/components/GiBoundedSetMap.vue
index 7c0369a3c..0724c469c 100644
--- a/plugin-designs/gospel-internet/src/components/GiBoundedSetMap.vue
+++ b/plugin-designs/gospel-internet/src/components/GiBoundedSetMap.vue
@@ -25,7 +25,7 @@ import { addTieredPointLayers } from '@map/charts/whiteboard/tiered-points.js'
 import { createBoardMap } from '../boardEngine.js'
 import { useBoardState } from '../useBoard.js'
 import { useGiT } from '../useGiT.js'
-import { layoutBoundedSet } from '../boundedSet.js'
+import { layoutBoundedSet } from '@map/components/charts/boundedSet.js'
 import { boundedSetFeatures, toFeatureCollection, dishRadiusDegrees, degreesToPixelRadius, TIERS } from '../setChartFeatures.js'
 
 const props = defineProps({ groups: { type: Array, default: () => [] } })
diff --git a/plugin-designs/gospel-internet/src/components/GiCenteredSetMap.vue b/plugin-designs/gospel-internet/src/components/GiCenteredSetMap.vue
index 8642734cc..8c5c0210a 100644
--- a/plugin-designs/gospel-internet/src/components/GiCenteredSetMap.vue
+++ b/plugin-designs/gospel-internet/src/components/GiCenteredSetMap.vue
@@ -27,7 +27,7 @@ import { createBoardMap } from '../boardEngine.js'
 import { useBoardState } from '../useBoard.js'
 import { useGiT } from '../useGiT.js'
 import { ringInfo, CENTRE_COLOR } from '../ringInfo.js'
-import { layoutCenteredSet, ringRadii, RING_MAX } from '../centeredSet.js'
+import { layoutCenteredSet, ringRadii, RING_MAX } from '@map/components/charts/centeredSet.js'
 import { centeredSetFeatures, toFeatureCollection, TIERS } from '../setChartFeatures.js'
 
 const props = defineProps({