Actual Mapmerge fix

This time it works hopefully.