fixed multiple collision resolver
Merge branch 'charge-cannon' of https://github.com/chanko08/Geometry into charge-cannon