Started collission resolution
Merge branch 'collisions' of github.com:DavidTruby/Sanguine into collisions