diff --git a/init.lua b/init.lua
index 667bbff6..7d3d0429 100644
--- a/init.lua
+++ b/init.lua
@@ -41,6 +41,7 @@ P.S. You can delete this when you're done too. It's your config now :)
 --  NOTE: Must happen before plugins are required (otherwise wrong leader will be used)
 vim.g.mapleader = ' '
 vim.g.maplocalleader = ' '
+vim.g.CtrlSpaceDefaultMappingKey = "<C-space> "
 
 -- Install package manager
 --    https://github.com/folke/lazy.nvim
@@ -493,10 +494,13 @@ cmp.setup {
   },
 }
 
+<<<<<<< HEAD
 vim.keymap.set("n", "<leader>ww", function()
     local picked_window_id = picker.pick_window() or vim.api.nvim_get_current_win()
     vim.api.nvim_set_current_win(picked_window_id)
 end, { desc = "Pick a window" })
+=======
+>>>>>>> 719b504 (feat: add vim ctrlspace plugin)
 
 -- The line beneath this is called `modeline`. See `:help modeline`
 -- vim: ts=2 sts=2 sw=2 et