diff --git a/git/.gitconfig b/git/.gitconfig
index 452fef4..0834f76 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -14,7 +14,6 @@
 	sslVerify = false
 [merge]
 	tool = diffconflicts
-	conflictstyle=diff3
 [mergetool "diffconflicts"]
 	cmd = nvim -c "DiffConflicts" "$MERGED" "$BASE" "$LOCAL" "$REMOTE"
 	trustExitCode = true