master edit 1
master edit 2
branch1 edit 1
Merge branch 'branch1'

Conflicts:
	test.txt