deleted all remaining test related material
introduced collision resolution logic