moved resolution of overlapping entities to Parent class