delete and draw line
please fix conflict
please fix conflict