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

(cherry picked from commit 40f049ba021448e30794657279c0be6ae559079f)