diff --git a/site-modules/core/templates/git/gitconfig.erb b/site-modules/core/templates/git/gitconfig.erb
index 8c0d3b6..78c9548 100644
--- a/site-modules/core/templates/git/gitconfig.erb
+++ b/site-modules/core/templates/git/gitconfig.erb
@@ -10,9 +10,15 @@
   editor = $ZSH/plugins/emacs/emacsclient.sh -nw
   autocrlf = input
 
+[merge]
+  conflictstyle = diff3
+
 [rerere]
   enabled = true
 
+[push]
+  default = current
+
 [pager]
   diff = delta --light
   log = delta --light