Conflict resolution for deletes