feature1 commits
change textb
modified
for master
Merge branch 'feature1'

Conflicts:
	testbranch.txt