diff --git a/.gitconfig b/.gitconfig
index c4d2253..c363392 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -78,3 +78,7 @@
 #	postBuffer = 1048576000
 #	lowSpeedLimit = 0
 #	lowSpeedTime = 999999
+[init]
+	defaultBranch = main
+[merge]
+	tool = vimdiff