diff --git a/dot_gitconfig.tmpl b/dot_gitconfig.tmpl
index 0c6ae2a..e392156 100644
--- a/dot_gitconfig.tmpl
+++ b/dot_gitconfig.tmpl
@@ -18,13 +18,14 @@
 
 [delta]
     navigate = true    # use n and N to move between diff sections
+    side-by-side = true
 
     # delta detects terminal colors automatically; set one of these to disable auto-detection
     # dark = true
     # light = true
 
 [merge]
-    conflictstyle = diff3
+    conflictstyle = zdiff3
 
 [diff]
     colorMoved = default