Revert "for delete conflict"

This reverts commit 3808b66c86bfa3513449d3eca85ee341b3ca39a6.
for conflict