There are two important issues:
1) We're not parsing the merge bit in the Map-Register and we're not setting it in Map-Notify. The former also results in authentication errors for xTRs requesting merging.
2) Merged locators are not sorted