Intersection with circles working
Conflicts solved