afile.txt: NEW LINE 2
Fixed merge conflict