collide-... changes
collide-... changes... merged