Tag browsing: conflict resolution