Add head 2
add head3
Merge conflict solved
Master C1 Add Master1