checking to see if a new branch works
Merge branch 'master' into new_branch