Resolve conflicts, segragate collisions listener