diff --git a/vite.config.ts b/vite.config.ts
index b681bfa..025ded5 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -25,13 +25,7 @@ export default defineConfig(({ mode }) => ({
           '**/*.{js,css,html,ico,png,svg}'
         ],
         // Don't intercept standalone app paths — they have their own service workers
-<<<<<<< HEAD
-        navigateFallbackDenylist: [/^\/sortir\//, /^\/castle\//, /^\/wallet\//, /^\/chat\//, /^\/market\//, /^\/cart\//, /^\/checkout\//, /^\/tasks\//],
-||||||| af33801
-        navigateFallbackDenylist: [/^\/sortir\//, /^\/castle\//],
-=======
-        navigateFallbackDenylist: [/^\/sortir\//, /^\/castle\//, /^\/forum\//, /^\/submit\//, /^\/submission\//],
->>>>>>> feat/forum-standalone
+        navigateFallbackDenylist: [/^\/sortir\//, /^\/castle\//, /^\/wallet\//, /^\/chat\//, /^\/market\//, /^\/cart\//, /^\/checkout\//, /^\/tasks\//, /^\/forum\//, /^\/submit\//, /^\/submission\//],
       },
       includeAssets: [
         'favicon.ico',