[FIX]hr_evaluation: resolved conflict.