diff --git a/tsconfig.json b/tsconfig.json
index 3de2238..3a3c026 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -30,8 +30,13 @@
   ],
   "exclude": [
     "node_modules",
+<<<<<<< HEAD
+    "src/components-vite",
+    "src/pages-vite",
+=======
     "src/hooks",
     "src/services",
+>>>>>>> origin/master
     "**/*.bak"
   ]
 }