diff --git a/init.lua b/init.lua
index 3cffef5d..35f92e05 100644
--- a/init.lua
+++ b/init.lua
@@ -237,8 +237,11 @@ require('lazy').setup({
         { '<leader>h', group = 'Git [H]unk', mode = { 'n', 'v' } },
       },
     },
+    config = function() -- This is the function that runs, AFTER loading
+      require('which-key').setup()
+    end,
   },
-
+uu
   -- NOTE: Plugins can specify dependencies.
   --
   -- The dependencies are proper plugin specifications as well - anything
diff --git a/lua/custom/plugins/copilot-cmp.lua b/lua/custom/plugins/copilot-cmp.lua
index 560f181a..983da19c 100644
--- a/lua/custom/plugins/copilot-cmp.lua
+++ b/lua/custom/plugins/copilot-cmp.lua
@@ -7,9 +7,13 @@ return {
     require('copilot_cmp').setup()
   end,
   opts = {
+<<<<<<< HEAD
     filetypes = {
       ['.'] = false,
       go = true,
     },
+=======
+    filetypes = { ['.'] = false },
+>>>>>>> 605d213 (disable copilot)
   },
 }
diff --git a/lua/custom/plugins/copilot.lua b/lua/custom/plugins/copilot.lua
index ca5fa63c..6fbac8a3 100644
--- a/lua/custom/plugins/copilot.lua
+++ b/lua/custom/plugins/copilot.lua
@@ -6,5 +6,9 @@ return {
   opts = {
     suggestion = { enabled = false },
     panel = { enabled = false },
+    filetypes = {
+      ['.'] = false,
+      go = true,
+    },
   },
 }