Collision resolution!
Merge pull request #3 from jtmac6/ry60003333

Collision resolution!