Collision solved
Collision solved
Fixed bugs with polygon and polyline
Resolved merge conflict