truble with colision detection
merge