Tag#conflict resolution