Somehow in learning how to use git I lost half the changes needed to fix the collisio...