* Added conflicting entities feature to stores