add e remove sib
conflict resolved