add line 2
add line function
bug fixed
conflito