adds new line: in file3.txt
edits to remove conflict during merging