add delete conflict feature