diff --git a/git/.gitconfig b/git/.gitconfig
index 26227a7..9154a04 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -13,9 +13,12 @@
 [http]
 	sslVerify = false
 [merge]
-	tool = diffconflicts
-[mergetool "diffconflicts"]
-	cmd = nvim -c "DiffConflicts" "$MERGED" "$BASE" "$LOCAL" "$REMOTE"
+	tool = vimdiff
+	conflictstyle = diff3
+[mergetool]
+	prompt = false
+[mergetool "vimdiff"]
+	cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
 	trustExitCode = true
 	keepBackup = false
 [commit]
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 30bc646..7b8994c 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -22,7 +22,6 @@ Plug 'rhysd/git-messenger.vim'
 Plug 'tpope/vim-fugitive'
 Plug 'airblade/vim-gitgutter'
 Plug 'rhysd/conflict-marker.vim'
-Plug 'whiteinge/diffconflicts'
 Plug 'salcode/vim-interactive-rebase-reverse'
 Plug 'stsewd/fzf-checkout.vim'
 " Boost vim command line mode