add new_branch.txt
add new_branch2.txt
Merge branch 'master' into new_branch
Merge branch 'new_branch'