change in new branch
change in master
Merge branch 'new_branch'

Conflicts:
	test.txt
new change in master
final
Merge branch 'new_branch'

Conflicts:
	test.txt