resolve a delete conflict