Better collision resolution
Merge pull request #4 from jtmac6/ry60003333

Better collision resolution