conflict resolution Tag