diff --git a/.config/nvim/.gitignore b/.config/nvim/.gitignore
index cc5457ab..0b68b6f4 100644
--- a/.config/nvim/.gitignore
+++ b/.config/nvim/.gitignore
@@ -1,7 +1,6 @@
 tt.*
 .tests
 doc/tags
-debug
 .repro
 foo.*
 *.log
diff --git a/.config/nvim/lazyvim.json b/.config/nvim/lazyvim.json
index 7bc15c4d..e952331d 100644
--- a/.config/nvim/lazyvim.json
+++ b/.config/nvim/lazyvim.json
@@ -36,7 +36,6 @@
     "plugins.extras.editor.color",
     "plugins.extras.editor.docs.devdocs",
     "plugins.extras.editor.git.diffview",
-    "plugins.extras.editor.git.git-conflict",
     "plugins.extras.editor.git.github",
     "plugins.extras.editor.git.worktree",
     "plugins.extras.editor.harpoon",
diff --git a/.config/nvim/lua/plugins/extras/coding/debug/debugprint.lua b/.config/nvim/lua/plugins/extras/coding/debug/debugprint.lua
new file mode 100644
index 00000000..f82bd11a
--- /dev/null
+++ b/.config/nvim/lua/plugins/extras/coding/debug/debugprint.lua
@@ -0,0 +1,46 @@
+return {
+  {
+    "andrewferrier/debugprint.nvim",
+    opts = {
+      create_keymaps = false,
+    },
+    keys = {
+      {
+        "<Leader>dLl",
+        function()
+          require("debugprint").debugprint()
+        end,
+        desc = "Log under current line",
+      },
+      {
+        "<Leader>dLL",
+        function()
+          require("debugprint").debugprint({ above = true })
+        end,
+        desc = "Log above current line",
+      },
+      {
+        "<Leader>dLv",
+        function()
+          require("debugprint").debugprint({ variable = true })
+        end,
+        desc = "Log variable under current line",
+      },
+      {
+        "<Leader>dLV",
+        function()
+          require("debugprint").debugprint({ above = true, variable = true })
+        end,
+        desc = "Log variable above current line",
+      },
+    },
+  },
+  {
+    "folke/which-key.nvim",
+    opts = {
+      defaults = {
+        ["<leader>dL"] = { name = "+log" },
+      },
+    },
+  },
+}
diff --git a/.config/nvim/lua/plugins/extras/coding/debug/repl.lua b/.config/nvim/lua/plugins/extras/coding/debug/repl.lua
new file mode 100644
index 00000000..ad7296ab
--- /dev/null
+++ b/.config/nvim/lua/plugins/extras/coding/debug/repl.lua
@@ -0,0 +1,76 @@
+return {
+  "michaelb/sniprun",
+  run = "bash ./install.sh",
+  cmd = { "SnipRun", "SnipInfo", "SnipLive", "SnipClose", "SnipReset", "SnipReplMemoryClean" },
+  opts = {
+
+    selected_interpreters = {}, --# use those instead of the default for the current filetype
+    repl_enable = { "javascript", "typescript" }, --# enable REPL-like behavior for the given interpreters
+    repl_disable = {}, --# disable REPL-like behavior for the given interpreters
+
+    interpreter_options = {
+      --# interpreter-specific options, see docs / :SnipInfo <name>
+
+      --# use the interpreter name as key
+      GFM_original = {
+        use_on_filetypes = { "markdown.pandoc" }, --# the 'use_on_filetypes' configuration key is
+        --# available for every interpreter
+      },
+      Python3_original = {
+        error_truncate = "auto", --# Truncate runtime errors 'long', 'short' or 'auto'
+        --# the hint is available for every interpreter
+        --# but may not be always respected
+      },
+    },
+
+    --# you can combo different display modes as desired and with the 'Ok' or 'Err' suffix
+    --# to filter only sucessful runs (or errored-out runs respectively)
+    display = {
+      -- "Classic", --# display results in the command-line  area
+      -- "VirtualTextOk", --# display ok results as virtual text (multiline is shortened)
+
+      "VirtualText", --# display results as virtual text
+      -- "TempFloatingWindow",      --# display results in a floating window
+      -- "LongTempFloatingWindow",  --# same as above, but only long results. To use with VirtualText[Ok/Err]
+      -- "Terminal", --# display results in a vertical split
+      -- "TerminalWithCode", --# display results and code history in a vertical split
+      -- "NvimNotify",              --# display with the nvim-notify plugin
+      -- "Api"                      --# return output to a programming interface
+    },
+
+    live_display = { "VirtualTextOk" }, --# display mode used in live_mode
+
+    display_options = {
+      terminal_scrollback = vim.o.scrollback, --# change terminal display scrollback lines
+      terminal_line_number = false, --# whether show line number in terminal window
+      terminal_signcolumn = false, --# whether show signcolumn in terminal window
+      terminal_persistence = true, --# always keep the terminal open (true) or close it at every occasion (false)
+      terminal_width = 45, --# change the terminal display option width
+      notification_timeout = 5, --# timeout for nvim_notify output
+    },
+
+    --# You can use the same keys to customize whether a sniprun producing
+    --# no output should display nothing or '(no output)'
+    show_no_output = {
+      "Classic",
+      "TempFloatingWindow", --# implies LongTempFloatingWindow, which has no effect on its own
+    },
+
+    --# customize highlight groups (setting this overrides colorscheme)
+    -- snipruncolors = {
+    --   SniprunVirtualTextOk = { bg = "#66eeff", fg = "#000000", ctermbg = "Cyan", cterfg = "Black" },
+    --   SniprunFloatingWinOk = { fg = "#66eeff", ctermfg = "Cyan" },
+    --   SniprunVirtualTextErr = { bg = "#881515", fg = "#000000", ctermbg = "DarkRed", cterfg = "Black" },
+    --   SniprunFloatingWinErr = { fg = "#881515", ctermfg = "DarkRed" },
+    -- },
+
+    live_mode_toggle = "off", --# live mode toggle, see Usage - Running for more info
+
+    --# miscellaneous compatibility/adjustement settings
+    inline_messages = false, --# inline_message (0/1) is a one-line way to display messages
+    --# to workaround sniprun not being able to display anything
+
+    borders = "single", --# display borders around floating windows
+    --# possible values are 'none', 'single', 'double', or 'shadow'
+  },
+}