diff --git a/.gitignore b/.gitignore
index bf132e0781..e485aaeee4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ package-lock.json
 .*.dockerfile
 lib/
 package.json.lerna_backup
+/*.iml
diff --git a/@commitlint/is-ignored/src/index.js b/@commitlint/is-ignored/src/index.js
index e21484a06c..839786d2ab 100644
--- a/@commitlint/is-ignored/src/index.js
+++ b/@commitlint/is-ignored/src/index.js
@@ -16,6 +16,8 @@ const WILDCARDS = [
 				.trim()
 		),
 	c => c.match(/^Merged (.*?)(in|into) (.*)/),
+	c => c.match(/^Merge remote-tracking branch (.*)/),
+	c => c.match(/^Automatic merge from (.*)/),
 	c => c.match(/^Auto-merged (.*?) into (.*)/)
 ];