fix to delete conflict issue