Fixup a merge error and commit updated lock file

server/index.js

@@ -6,7 +6,7 @@
 
 import express from "express"
 import compression from "compression"
-import { renderPage } from "vite-plugin-ssr/server"
+import { renderPage } from "vike/server";
 import { root } from "./root.js"
 
 // Auth imports

src/pages/dev/security/index.page.route.ts

@@ -1,4 +1,4 @@
-import { render, redirect } from 'vite-plugin-ssr/abort'
+import { render, redirect } from 'vike/abort'
 
 export const guard = (pageContext) => {
   const { user } = pageContext

src/pages/maps/@id/edit/index.page.ts

@@ -1,5 +1,5 @@
 import { PageContextBuiltInServer } from "vike/types";
-import { SETTINGS } from "~/map-interface/settings";
+import { SETTINGS } from "~/settings";
 import h from "@macrostrat/hyper";
 import { ClientOnly } from "~/renderer/client-only";
 

src/pages/maps/@id/edit/map-interface.ts

@@ -13,7 +13,7 @@ import boundingBox from "@turf/bbox";
 import { LngLatBoundsLike } from "mapbox-gl";
 import { useEffect, useMemo, useState } from "react";
 import { MapNavbar } from "~/components/map-navbar";
-import { SETTINGS } from "~/map-interface/settings";
+import { SETTINGS } from "~/settings";
 import "~/styles/global.styl";
 import { s3Address, tempImageIndex } from "../../raster-images";
 import styles from "./main.module.sass";