wow, collisions still don't work
merge nonsense