modified at "branchtest" branch
modified at "master" branch
Merge branch 'branchtest'

Conflicts:
	test.txt