Tag conflict management