Commit 1

This is commit 1.
Commit 2

Commit 2
Commit 3

Commit 3 on branch1
Merge branch 'orphan1' into branch1

Conflicts:
	a.txt
Commit 7

Merge branch 'orphan1'

Conflicts:
	a.txt
Merge branch 'master' of github.com:pivotal-jbarrett/test

Conflicts:
	a.txt
Merge branch 'master' of github.com:pivotal-jbarrett/test
Commit 12