corrections from branch string-dict-merge