Fixed a bug with collision resolution
Merge pull request #5 from jtmac6/ry60003333

Fixed a bug with collision resolution