diff --git a/.gitconfig.MKAYSIGREP b/.gitconfig.MKAYSIGREP
index 41b5e82c..0be9133d 100644
--- a/.gitconfig.MKAYSIGREP
+++ b/.gitconfig.MKAYSIGREP
@@ -21,5 +21,3 @@
 	signingkey = 0xDAA6CA08F2E96AC7
 [push]
 	default = current
-[branch]
-	autosetupmerge = always
diff --git a/gitconfig b/gitconfig
index ab98ff10..7c8f92ad 100644
--- a/gitconfig
+++ b/gitconfig
@@ -21,5 +21,3 @@
 	#signingkey = 0xDAA6CA08F2E96AC7
 [push]
 	default = current
-[branch]
-	autosetupmerge = always