diff --git a/git/.gitconfig b/git/.gitconfig
index 55b9201..4b7433c 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -25,5 +25,10 @@
 	ui = true
 [diff]
 	wsErrorHighlight = all
+    algorithm = histogram
 [commit]
 	verbose = true
+[merge]
+	conflictstyle = diff3
+[branch]
+	sort = -committerdate