add collision
merge