diff --git a/.commitlintrc.ts b/.commitlintrc.ts
index b446373c21..3703bab5f2 100644
--- a/.commitlintrc.ts
+++ b/.commitlintrc.ts
@@ -8,19 +8,29 @@ const config: UserConfig = {
       RuleConfigSeverity.Error,
       'always',
       [
+        'build',
         'chore',
         'ci',
+        'comments',
         'docs',
+        'enh',
         'enhancement',
         'feat',
         'fix',
         'release',
         'revert',
         'security',
+        'style',
         'test',
       ],
     ],
   },
+  ignores: [
+    (commitMessage) => {
+      // add an exception for github
+      return /^Merge branch '.*' into [a-zA-Z0-9\/\-_]+$/.test(commitMessage);
+    },
+  ],
 };
 
 export default config;