diff --git a/git/.gitconfig b/git/.gitconfig
index 067d80e..8943757 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -1,9 +1,15 @@
 [user]
 	name = Sanchayan Maity
 	email = maitysanchayan@gmail.com
+	login = sanchayanmaity
 [core]
-	editor = "emacsclient -t"
+	editor = "nvim"
+	pager = delta --dark
 [color]
 	ui = auto
 [sendemail]
 	smtpserver = /usr/bin/msmtp
+[http]
+	sslVerify = false
+[alias]
+	conflicted = !vim +Conflicted