diff --git a/gitconfig b/gitconfig
index c456a29..7f7b996 100644
--- a/gitconfig
+++ b/gitconfig
@@ -25,7 +25,13 @@
     sw = switch
 
 [interactive]
-    diffFilter = delta
+    diffFilter = delta --color-only
+
+[merge]
+    conflictstyle = diff3
+
+[diff]
+    colorMoved = default
 
 [delta]
     features = tokyonight