collider player
resolved conflicts