Fixed one more merge bug
Grader.js probrably is finished