COLISIONES
Revert "COLISIONES"

This reverts commit f52b580c1ad1996eea9fe717c6bda362103a81be.
Revert "Revert "COLISIONES""

This reverts commit 038012faa61dd09e93cb6093befaf858e4a3d483.