test 4 - edit branch2
test 5
Merge branch 'origin/branch2'

Conflicts:
	README.txt
test 7 - edit dev branch