commit in master 6
Merge branch 'temp'
Merge branch 'temp'
fixed merge conflict
merge conflict
fixed merge
commit 10
commit 11
commit 13
commit 12
foo2
foo3
temp checkin
master