add c4 in conflict
merge conflict c1 c4