added collision resolution for equipment