adding collision resolution