m1
m2
m3
Merge branch 'master' into new_branch

Conflicts:
	test.txt