editGrade merge fix and some SystemOuts

* Merge debug lines removal
* System.out removal