collision

collision fixed, todo movement again