Fix merge and rework collision mechanism

Alexandre Pouxrequested to merge
fix_collision into master

I think I tested it well enough, But il you can throw a second look at it, it would be cool

Edited by Alexandre Poux

Merge request reports