diff --git a/modules/old_configs/nvim/lua/liamm/remap.lua b/modules/old_configs/nvim/lua/liamm/remap.lua
index 36fb969..8c19069 100644
--- a/modules/old_configs/nvim/lua/liamm/remap.lua
+++ b/modules/old_configs/nvim/lua/liamm/remap.lua
@@ -21,7 +21,11 @@ vim.keymap.set("n", "<leader>Y", "\"+Y")
 
 vim.keymap.set("n", "<leader>x", "<cmd>!chmod +x %<CR>", {silent = true})
 
+<<<<<<< HEAD
 -- put nvim to background 
+=======
+-- put to background 
+>>>>>>> main
 vim.keymap.set("n", "<leader>bg", "<C-z>")
 
 -- BUILD SCRIPT INVOKATIONS