[OE-3096] handle sequence conflicts when editing