Local changes for the TokenMergeContainer