BUG-865: remove the use of ModificationType.MERGE