worked on collision handling
Merge fix
Fixed merge