I'm not sure what you mean here. The conflict-resolution dialog means exactly that — that there's a conflict you need to resolve. You can do that from the CR dialog without deleting anything.

Can you explain the exact problem you're facing?