diff --git a/lua/custom/plugins/copilot-cmp.lua b/lua/custom/plugins/copilot-cmp.lua
index 983da19c..560f181a 100644
--- a/lua/custom/plugins/copilot-cmp.lua
+++ b/lua/custom/plugins/copilot-cmp.lua
@@ -7,13 +7,9 @@ return {
     require('copilot_cmp').setup()
   end,
   opts = {
-<<<<<<< HEAD
     filetypes = {
       ['.'] = false,
       go = true,
     },
-=======
-    filetypes = { ['.'] = false },
->>>>>>> 605d213 (disable copilot)
   },
 }