Remove merge conflict markers and clean up Vite configuration

Author: DDH2004

vite.config.ts

@@ -3,7 +3,6 @@ import react from '@vitejs/plugin-react';
 import { plugin as markdown } from 'vite-plugin-markdown';
 
 export default defineConfig({
-<<<<<<< HEAD
   base: './', // Change from '/DDH2004.github.io/' to './'
   plugins: [
     react(),
@@ -21,12 +20,4 @@ export default defineConfig({
       }
     }
   }
-=======
-  plugins: [
-    react(),
-    markdown({
-      mode: ['react', 'raw'] // This enables both React components and raw string imports
-    })
-  ]
->>>>>>> dev
 });