diff --git a/git/gitconfig b/git/gitconfig
index 7c81615..bba239a 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -32,17 +32,13 @@
 	old = red bold
 	new = 64 
 	whitespace = red reverse            
+[merge]
+	tool = fugitive
 [mergetool]
 	keepBackup = false
 	prompt = false
-[diff]
-	tool = vimdiff
-[difftool "vimdiff"]
-	cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
-[mergetool "vimdiff"]
-	cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
-[difftool]
-	prompt = false
+[mergetool "fugitive"]
+	cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
 [gitflow]
 	multi-hotfix = true
 [gitflow "branch"]
@@ -59,12 +55,6 @@
 	date = relative
 [format]
 	pretty = format:%C(yellow)%h %Cblue%>(12)%ad %C(red)%G? %Cgreen%<(7,trunc)%aN%Cred%d %Creset%s
-[merge]
-	tool = nvim
-[mergetool "nvim"]
-	cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
-[mergetool "bc"]
-	path = /mnt/c/Program Files/Beyond Compare 4/BComp.exe
 [rerere]
 	enabled = true
 [fetch]