Another edit to file 8
sd
Added on branch test 2
Edit to file 8 on master
Some local changes
Merge branch 'jim/test4'

Conflicts:
	file8.orig