committing fixes to collisions