identity map like implementation
conflicts and bump versions