test file changed
changes to master
Merge branch 'new_branch'

Conflicts:
	test_file
more changes in branch
Merge branch 'new_branch'

Conflicts:
	test_file