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