edited new_file.txt
merged the 2 commits