second commit
third commit
Merge branch 'new_branch'