merging
 Solved the conflict on the line.cpp
Merging