All of the `merge` functions here should have been taken out, I thought that was done when I pulled the CMap change :\, can you modify this to use CMap instead of `merge`?