delete from branch
add to branch
Merge branch 'Master-Merge-Test'
test
Merge branch 'Master-Merge-Test'

Conflicts:
	test5.txt