diff --git a/.gitconfig.MKAYSIGREP b/.gitconfig.MKAYSIGREP
index fef88b27..d1ac6507 100644
--- a/.gitconfig.MKAYSIGREP
+++ b/.gitconfig.MKAYSIGREP
@@ -1,3 +1,7 @@
+[user]
+    name = Mikaela Suomalainen
+    email = mikaela.suomalainen@outlook.com
+    signingkey = 0xDAA6CA08F2E96AC7
 [alias]
     # From https://github.com/blog/985-git-io-github-url-shortener#comment-15121
     shorten = "!sh -c 'curl -i http://git.io -F url=$1' -"
@@ -18,11 +22,9 @@
     showbranch = true
     status = true
     ui = true
-[user]
-    name = Mikaela Suomalainen
-    email = mikaela.suomalainen@outlook.com
-    signingkey = 0xDAA6CA08F2E96AC7
 [push]
     default = current
 [credential]
-	helper = cache --timeout=86400
+    helper = cache --timeout=86400
+[merge]
+    ff = only
diff --git a/gitconfig b/gitconfig
index 7106e8aa..c06f16e4 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,3 +1,7 @@
+[user]
+#    name = Mikaela Suomalainen
+#    email = mikaela.suomalainen@outlook.com
+#    signingkey = 0xDAA6CA08F2E96AC7
 [alias]
     # From https://github.com/blog/985-git-io-github-url-shortener#comment-15121
     shorten = "!sh -c 'curl -i http://git.io -F url=$1' -"
@@ -18,11 +22,9 @@
     showbranch = true
     status = true
     ui = true
-[user]
-#    name = Mikaela Suomalainen
-#    email = mikaela.suomalainen@outlook.com
-#    signingkey = 0xDAA6CA08F2E96AC7
 [push]
     default = current
 [credential]
-       helper = cache --timeout=86400
+    helper = cache --timeout=86400
+[merge]
+    ff = only