diff --git a/Utils/Git/Repository.php b/Utils/Git/Repository.php
index f8d75ab4e..335f0e73b 100644
--- a/Utils/Git/Repository.php
+++ b/Utils/Git/Repository.php
@@ -853,6 +853,10 @@ class Repository
             throw new \Exception('Invalid commit id');
         }
 
+        if(StringUtils::startsWith($lines[1], 'Merge')) {
+            return new Commit();
+        }
+
         // todo: validate if array values are all initialized
         $author = explode(':', $lines[1]);
         $author = explode('<', trim($author[1]));