collision working
merge fixed