better handling of duplicate data/aliases when merging - #1659

better handling of duplicate data/aliases when merging#1659

griffin-h wants to merge 1 commit into

TOMToolkit:devTOMToolkit/tom_base:devfrom

griffin-h:merge_duplicatesgriffin-h/tom_base:merge_duplicatesCopy head branch name to clipboard