Added line function
Solved conflict