Run some forced "!rosterupdate" after the merge and it will be fine i think.
All char got their uniq ID, that do not change if they change name.
This uniq ID is stored in the bot, from what i remember last merge bot updated the member names when doing a "!rosterupdate" if the bot didnt allready do it.