Refactoring: move the merge function to the TokenHandler, now can embeded token are handle