add c4 in conflict1