Added some line markings
Solved the merge conflict
Added a hell of a lot of .line statements