after/ftplugin/python.vim

@@ -12,5 +12,3 @@ set tabstop=4       " number of visual spaces per TAB
 set softtabstop=4   " number of spaces in tab when editing
 set shiftwidth=4    " number of spaces to use for autoindent
 set expandtab       " expand tab to spaces so that tabs are spaces
-
-nnoremap <buffer><silent> <space>f <cmd>silent !black %<CR>

lua/config/git-conflict.lua

@@ -1,12 +0,0 @@
-require("git-conflict").setup {}
-
-vim.api.nvim_create_autocmd("User", {
-  pattern = "GitConflictResolved",
-  callback = function()
-    -- clear qf list
-    vim.fn.setqflist({}, "r")
-
-    -- reopen it?
-    vim.cmd([[GitConflictListQf]])
-  end,
-})

lua/plugin_specs.lua

@@ -321,14 +321,7 @@ local plugin_specs = {
 
   -- Better git log display
   { "rbong/vim-flog", cmd = { "Flog" } },
-  {
-    "akinsho/git-conflict.nvim",
-    version = "*",
-    event = "VeryLazy",
-    config = function()
-      require("config.git-conflict")
-    end,
-  },
+  { "akinsho/git-conflict.nvim", version = "*", config = true },
   {
     "ruifm/gitlinker.nvim",
     event = "User InGitRepo",