diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ab78fef..4b0dd6c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,4 +8,4 @@ npm run test
 
 ## Conventional commits
 
-Mergely is using [conventional commits](https://www.conventionalcommits.org/en/v1.0.0).
+Mergely is using [conventional commits](https://www.conventionalcommits.org/en/v1.0.0), and [standard-version](https://www.npmjs.com/package/standard-version).
diff --git a/git-conventional-commits.json b/git-conventional-commits.json
index 1ef7b7a..43c39ae 100644
--- a/git-conventional-commits.json
+++ b/git-conventional-commits.json
@@ -4,6 +4,8 @@
       "build",
       "chore",
       "ci",
+      "feat",
+      "fix",
       "docs",
       "style",
       "refactor",
diff --git a/src/lcs.js b/src/lcs.js
index a8fa9b4..5205fe9 100644
--- a/src/lcs.js
+++ b/src/lcs.js
@@ -3,7 +3,7 @@ const DiffParser = require('./diff-parser');
 
 function LCS(x, y, options) {
 	function getPositionOfWords(text, options) {
-		var exp = new RegExp(/\w+/g);
+		var exp = new RegExp(/[^\s]/g);
 		var map = {};
 		var match;
 		var item = 0;