diff --git a/dot_gitconfig.tmpl b/dot_gitconfig.tmpl
index 09513c6..3924615 100644
--- a/dot_gitconfig.tmpl
+++ b/dot_gitconfig.tmpl
@@ -26,4 +26,8 @@
 [rebase]
 	updateRefs = true
 [merge]
+{{- if eq .chezmoi.hostname "ftpserver" }}
+	conflictstyle = diff3
+{{- else }}
 	conflictstyle = zdiff3
+{{ end -}}