diff --git a/HOME/.gitconfig b/HOME/.gitconfig
index c7766b8..bec2e9a 100644
--- a/HOME/.gitconfig
+++ b/HOME/.gitconfig
@@ -13,8 +13,8 @@
     required = true
 [interactive]
     diffFilter = delta --color-only
-[merge]
-    conflictstyle = diff3
+; [merge]
+;     conflictstyle = diff3
 [delta]
     navigate = true
     light = false