diff --git a/.gitconfig b/.gitconfig
index 18411b3..fe8cc92 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -37,12 +37,14 @@
   lineNumber = true
   extendRegexp = true
 
+[merge]
+  stat = true
+
 [push]
   default = current
 
 [pull]
   rebase = true
-  stat = true
 
 [includeIf "gitdir:~/Documents/Uni/"]
   path = ~/.gitconfigs/.gitconfig-uni