text added on the first line
add newfile.txt
two sentences added
one sentence added
fix merge conflict