diff --git a/vite.config.ts b/vite.config.ts
index 2e5c0254..64e40216 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,5 +1,8 @@
 import { resolve } from 'node:path';
+<<<<<<< HEAD
 import { URL, fileURLToPath } from 'node:url';
+=======
+>>>>>>> chore: prepare sshpk for cert/key/sshkeys related tools
 import { nodePolyfills } from 'vite-plugin-node-polyfills';
 
 import VueI18n from '@intlify/unplugin-vue-i18n/vite';