Merge primitive_collision branche