Further edits to the way CharMap works with merging
Further edits to the way CharMap works with merging