Index: oak-core/src/main/java/org/apache/jackrabbit/oak/api/CommitFailedException.java
===================================================================
--- oak-core/src/main/java/org/apache/jackrabbit/oak/api/CommitFailedException.java	(revision 1591462)
+++ oak-core/src/main/java/org/apache/jackrabbit/oak/api/CommitFailedException.java	(working copy)
@@ -235,6 +235,8 @@
             return new ReferentialIntegrityException(message, this);
         } else if (isOfType(STATE)) {
             return new InvalidItemStateException(message, this);
+        } else if (isOfType(MERGE)) {
+            return new InvalidItemStateException(message, this);
         } else if (isOfType(VERSION)) {
             return new VersionException(message, this);
         } else if (isOfType(LABEL_EXISTS)) {