ID conflict resolution