conflict resolution Archives