diff --git a/nuxt.config.ts b/nuxt.config.ts
index 8e93e9a..19a2d61 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -1,7 +1,6 @@
 import tailwindcss from "@tailwindcss/vite";
 
 export default defineNuxtConfig({
-<<<<<<< HEAD
     compatibilityDate: "2026-01-01",
     devtools: { enabled: true },