message of commit on issue1 branch
pretend fix on issue2
fixed something in issue1 aaparently
Merge branch 'issue1'

Conflicts:
	changeOne.txt