modify README.md on branch br1
modified new_file.txt on branch master
Merge branch 'br1'
conflict test on branch br1
conflict test on branch master
Merge branch 'br1'

Conflicts:
	new_file_on_branch_test.txt