Fixes potential race condition between child-merge operations