diff --git a/NUXT/pages/settings.vue b/NUXT/pages/settings.vue
index 7bea3fc..9d5e8a5 100644
--- a/NUXT/pages/settings.vue
+++ b/NUXT/pages/settings.vue
@@ -50,17 +50,7 @@ export default {
           to: "/mods/tweaks",
         },
         { name: "Startup Options", icon: "mdi-restart", to: "/mods/startup" },
-<<<<<<< HEAD
-        {
-          name: "Plugins",
-          icon: "mdi-puzzle",
-          to: "",
-          to: "/mods/plugins",
-          disabled: true,
-        },
-=======
         { name: "Plugins", icon: "mdi-puzzle", to: "", to: "/mods/plugins" },
->>>>>>> 94e0108 (Merge branch 'main' of https://github.com/Frontesque/VueTube)
         {
           name: "Updates",
           icon: "mdi-cloud-download-outline",