WIP for Map merge bugs