quality conflict resolution