updating evaluator
fix conflict
checkin before refactor