Better road drawing
Conflict resolved