Correction to merge for incompatible maps, fixes #262