fixed merge conflicts in Intersection