diff --git a/.gitconfig b/.gitconfig
index 77359ed..f2e9775 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -14,7 +14,12 @@
 [diff]
 	colorMoved = zebra
 [alias]
+	b = branch
 	c = commit
 	chk = checkout
 	l = log
 	s = status
+[merge]
+	ff = no
+	commit = no
+	conflictstyle = diff3