fixed collisions
Merge branch 'temp'