missed rebase-a-ronis

packages/cli/src/lifecycles/bundle.js

@@ -268,11 +268,7 @@ async function bundleSsrPages(compilation) {
         await fs.writeFile(entryFileUrl, `
           import { executeRouteModule } from '${normalizePathnameForWindows(executeModuleUrl)}';
 
-<<<<<<< HEAD
           const moduleUrl = new URL('${relativeDepth}${pagesPathDiff}${relativeWorkspacePagePath.replace('/', '')}', import.meta.url);
-=======
-          const moduleUrl = new URL('../${pagesPathDiff}${filename}', import.meta.url);
->>>>>>> 659193e3 (enhancement/Issue-1118: Single File Bundles for SSR and API routes (#1186))
 
           export async function handler(request) {
             const compilation = JSON.parse('${JSON.stringify(compilation)}');

packages/plugin-renderer-lit/README.md

@@ -87,16 +87,6 @@ export async function getBody() {
 }
 ```
 
-<<<<<<< HEAD
-=======
-## Caveats
-
-There are a few considerations to take into account when using a `LitElement` as your page component:
-- Lit SSR [**only** renders into declarative shadow roots](https://github.com/lit/lit/issues/3080#issuecomment-1165158794), so you will have to keep browser support and polyfill usage in mind.
-- Depending on your use case, SSR bundling may break due to bundle chunking and code splitting by Rollup, which we are [hoping to correct ASAP](https://github.com/ProjectEvergreen/greenwood/issues/1118).
-- At this time, `LitElement` does [not support `async` work](https://lit.dev/docs/ssr/overview/#library-status) which makes data fetching in pages a bit of challenge.  You can follow along with this issue [in the Lit repo](https://github.com/lit/lit/issues/2469).
-
->>>>>>> 82460ea4 (feature/issue 1197 Lit v3 upgrade and SSR fixes and enhancements (#1201))
 ## Options
 
 ### Isolation Mode