XCOMMONS-618: 3 ways merge with new version empty always end up empty