diff --git a/public/js/main.js b/public/js/main.js
index c118e86..047566f 100644
--- a/public/js/main.js
+++ b/public/js/main.js
@@ -7,12 +7,6 @@
     //-----------------
     let menu, animate;
 
-<<<<<<< HEAD
-var menu, animate;
-(function () {
-  // Initialize menu
-  //-----------------
-=======
     let layoutMenuEl = document.querySelectorAll('#layout-menu');
     layoutMenuEl.forEach(function (element) {
         menu = new Menu(element, {
@@ -23,7 +17,6 @@ var menu, animate;
         window.Helpers.scrollToActive((animate = false));
         window.Helpers.mainMenu = menu;
     });
->>>>>>> board-comment
 
     // Initialize menu togglers and bind click on each
     let menuToggler = document.querySelectorAll('.layout-menu-toggle');
diff --git a/src/layouts/NormalLayout.vue b/src/layouts/NormalLayout.vue
index 0277f84..08cef90 100644
--- a/src/layouts/NormalLayout.vue
+++ b/src/layouts/NormalLayout.vue
@@ -32,17 +32,17 @@
 
     window.isDarkStyle = window.Helpers.isDarkStyle();
 
-const loadScript = src => {
-    const script = document.createElement('script');
-    script.src = src;
-    script.type = 'text/javascript';
-    script.async = true;
-    document.body.appendChild(script);
-};
-nextTick(async () => {
-    await wait(200);
-    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);
+    };
+    nextTick(async () => {
+        await wait(200);
+        loadScript('/vendor/js/menu.js');
+        loadScript('/js/main.js');
+    });
 </script>
 <style></style>