created file after creating local branch
another change in master before merging
Merge remote-tracking branch 'origin/master' into testbranch

Conflicts:
	test.txt