sad_conflict-resolution