Changes to grader
fixed conflicts in grader