local_file.txt added
Merge branch 'new_branch'