update de confict