got line drawing
fixed confilct