Force add true and remove false flags in `add`, merge optional