diff --git a/.czrc b/.czrc
index 32b51d26..0c1b9659 100644
--- a/.czrc
+++ b/.czrc
@@ -54,7 +54,8 @@
     {
       "value": "📁 files",
       "name": "📁 files:    Changes in files or directories"
-    }
+    },
+    { "value": "🔀 merge", "name": "🔀 merge:   Merge branch or pull request" }
   ],
   "allowCustomScopes": true,
   "allowBreakingChanges": ["✨ feat", "🐛 fix"]
diff --git a/.gitconfig b/.gitconfig
index 9a052718..02f4fec4 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -101,7 +101,7 @@
 	ls = ls-files
 	lsf = !git ls-files | grep -i
 	#############
-	m = merge
+	mm = merge --no-ff -m "🔀 merge: Merge branch '$(git symbolic-ref --short HEAD)' into '$(git branch --show-current)'"
 	ma = merge --abort
 	mc = merge --continue
 	ms = merge --skip