I agree that the dict map is the place to handle this clash.