diff --git a/src/layouts/NormalLayout.vue b/src/layouts/NormalLayout.vue
index fa48142..0277f84 100644
--- a/src/layouts/NormalLayout.vue
+++ b/src/layouts/NormalLayout.vue
@@ -32,7 +32,6 @@
 
     window.isDarkStyle = window.Helpers.isDarkStyle();
 
-<<<<<<< HEAD
 const loadScript = src => {
     const script = document.createElement('script');
     script.src = src;
@@ -45,25 +44,5 @@ nextTick(async () => {
     loadScript('/vendor/js/menu.js');
     // loadScript('/js/main.js');
 });
-=======
-    const loadScript = src => {
-        const script = document.createElement('script');
-        script.src = src;
-        script.type = 'text/javascript';
-        script.async = true;
-        document.body.appendChild(script);
-        // script.onload = () => {
-        //     console.log(`${src} loaded successfully.`);
-        // };
-        script.onerror = () => {
-            console.error(`Failed to load script: ${src}`);
-        };
-    };
-    nextTick(async () => {
-        await wait(200);
-        loadScript('/vendor/js/menu.js');
-        loadScript('/js/main.js');
-    });
->>>>>>> board-comment
 </script>
 <style></style>