Grader.js and new Index
Merge fixed