edit alternate branch edit again 1
edit alternate branch edit again 1 2
edit alternate branch edit again 1 2 3
edit on branch 1: 9 edit
edit branch 1 with conflict
Merge branch 'branch1' into alternateBranch

Conflicts:
	masterFileTest.txt
conflict solved by hand