Added a data structure to keep track of lines
Resolved a conflict