Fix merge conflicts

Author: SecroLoL

e2etests/judgment_client_test.py

@@ -280,5 +280,4 @@ def test_classifier_scorer(client: JudgmentClient):
     print("Classifier scorer test successful")
     print("*" * 40)
 
->>>>>>> add_json_correctness_scorer
     print("All tests passed successfully")