new_branch
merged
Merge branches 'master' and 'new_branch'