rebased changed in conference/edit