test: added and edited file one to branch master
test: add file4 to master
Merge branch 'jim/test1'

Conflicts:
	file1
Merge branch 'jim/test2'

Conflicts:
	file1
	file1.orig
test: remove .orig files
Merge branch 'jim/test2'
test: added file 5 to branch jim/test1
Merge branch 'jim/test1'
Merge branch 'jim/test2'
test: added file 7 to branch 3
test: Amended file 7 on branch test 3
Added on branch test3
Merge branch 'jim/test3' into jim/test2

Conflicts:
	file8