unfinished collision
fixed merge