use concrete class for collision checker
Fix conflicts from automatic merge