add new branch test file
master 1
master 2
Merge branch 'new_branch'

Conflicts:
	master
master 3