cleaned up collision resolution