collision working
finally merged after three weeks
commtting the merge