diff --git a/public/sw.js b/public/sw.js
index a034b4c9a..9536f54db 100644
--- a/public/sw.js
+++ b/public/sw.js
@@ -36,11 +36,7 @@ try {
 // v1.4.38.4 → v1.4.42. Do not hand-edit; bump `package.json` and rebuild.
 const CACHE_VERSION =
   (typeof self !== "undefined" && self.__APP_VERSION__) ||
-<<<<<<< HEAD
   /* @sw-version-fallback */ "v1.30.28";
-=======
-  /* @sw-version-fallback */ "v1.30.27";
->>>>>>> main
 const STATIC_CACHE = `healthlog-static-${CACHE_VERSION}`;
 const PAGE_CACHE = `healthlog-pages-${CACHE_VERSION}`;
 // v1.18.6 — read-only data cache for a curated allowlist of safe GET `/api/*`