c1
c2
d1
d2
f1
f2
a1
a2
conflict fixed with amend
g1
g2
conflict fix from master