Tag conflict resolution