fixed grading
fixed merge conflict