new c2
new c3
master c2
Repaired conflicts
Merge remote-tracking branch 'origin/master' into b1