fix alllll the merge conflicts

lm_eval/tasks/cmmlu/cmmlu_chinese_history.yaml

+"dataset_name": "chinese_history"
+"description": "以下是关于中国历史的单项选择题，请直接给出正确答案的选项。\n\n"
+"include": "_default_template_yaml"
+"task": "cmmlu_chinese_history"

lm_eval/tasks/cmmlu/cmmlu_chinese_literature.yaml

+"dataset_name": "chinese_literature"
+"description": "以下是关于中国文学的单项选择题，请直接给出正确答案的选项。\n\n"
+"include": "_default_template_yaml"
+"task": "cmmlu_chinese_literature"

lm_eval/tasks/cmmlu/cmmlu_chinese_teacher_qualification.yaml

+"dataset_name": "chinese_teacher_qualification"
+"description": "以下是关于中国教师资格的单项选择题，请直接给出正确答案的选项。\n\n"
+"include": "_default_template_yaml"
+"task": "cmmlu_chinese_teacher_qualification"

lm_eval/tasks/cmmlu/cmmlu_clinical_knowledge.yaml

+"dataset_name": "clinical_knowledge"
+"description": "以下是关于临床知识的单项选择题，请直接给出正确答案的选项。\n\n"
+"include": "_default_template_yaml"
+"task": "cmmlu_clinical_knowledge"

lm_eval/tasks/cmmlu/cmmlu_college_actuarial_science.yaml

+"dataset_name": "college_actuarial_science"
+"description": "以下是关于大学精算学的单项选择题，请直接给出正确答案的选项。\n\n"
+"include": "_default_template_yaml"
+"task": "cmmlu_college_actuarial_science"

lm_eval/tasks/cmmlu/cmmlu_college_education.yaml

+"dataset_name": "college_education"
+"description": "以下是关于大学教育学的单项选择题，请直接给出正确答案的选项。\n\n"
+"include": "_default_template_yaml"
+"task": "cmmlu_college_education"

lm_eval/tasks/cmmlu/cmmlu_college_engineering_hydrology.yaml

+"dataset_name": "college_engineering_hydrology"
+"description": "以下是关于大学工程水文学的单项选择题，请直接给出正确答案的选项。\n\n"
+"include": "_default_template_yaml"
+"task": "cmmlu_college_engineering_hydrology"

lm_eval/tasks/cmmlu/cmmlu_college_law.yaml

+"dataset_name": "college_law"
+"description": "以下是关于大学法律的单项选择题，请直接给出正确答案的选项。\n\n"
+"include": "_default_template_yaml"
+"task": "cmmlu_college_law"

lm_eval/tasks/cmmlu/cmmlu_college_mathematics.yaml

+"dataset_name": "college_mathematics"
+"description": "以下是关于大学数学的单项选择题，请直接给出正确答案的选项。\n\n"
+"include": "_default_template_yaml"
+"task": "cmmlu_college_mathematics"

lm_eval/tasks/cmmlu/cmmlu_college_medical_statistics.yaml

+"dataset_name": "college_medical_statistics"
+"description": "以下是关于大学医学统计的单项选择题，请直接给出正确答案的选项。\n\n"
+"include": "_default_template_yaml"
+"task": "cmmlu_college_medical_statistics"

lm_eval/tasks/cmmlu/cmmlu_college_medicine.yaml

+"dataset_name": "college_medicine"
+"description": "以下是关于大学医学的单项选择题，请直接给出正确答案的选项。\n\n"
+"include": "_default_template_yaml"
+"task": "cmmlu_college_medicine"

lm_eval/tasks/cmmlu/cmmlu_computer_science.yaml

+"dataset_name": "computer_science"
+"description": "以下是关于计算机科学的单项选择题，请直接给出正确答案的选项。\n\n"
+"include": "_default_template_yaml"
+"task": "cmmlu_computer_science"

lm_eval/tasks/cmmlu/cmmlu_computer_security.yaml

+"dataset_name": "computer_security"
+"description": "以下是关于计算机安全的单项选择题，请直接给出正确答案的选项。\n\n"
+"include": "_default_template_yaml"
+"task": "cmmlu_computer_security"

lm_eval/tasks/cmmlu/cmmlu_conceptual_physics.yaml

+"dataset_name": "conceptual_physics"
+"description": "以下是关于概念物理学的单项选择题，请直接给出正确答案的选项。\n\n"
+"include": "_default_template_yaml"
+"task": "cmmlu_conceptual_physics"

lm_eval/tasks/cmmlu/cmmlu_construction_project_management.yaml

+"dataset_name": "construction_project_management"
+"description": "以下是关于建设工程管理的单项选择题，请直接给出正确答案的选项。\n\n"
+"include": "_default_template_yaml"
+"task": "cmmlu_construction_project_management"

lm_eval/tasks/cmmlu/cmmlu_economics.yaml

+"dataset_name": "economics"
+"description": "以下是关于经济学的单项选择题，请直接给出正确答案的选项。\n\n"
+"include": "_default_template_yaml"
+"task": "cmmlu_economics"

lm_eval/tasks/cmmlu/cmmlu_education.yaml

+"dataset_name": "education"
+"description": "以下是关于教育学的单项选择题，请直接给出正确答案的选项。\n\n"
+"include": "_default_template_yaml"
+"task": "cmmlu_education"

lm_eval/tasks/cmmlu/cmmlu_electrical_engineering.yaml

+"dataset_name": "electrical_engineering"
+"description": "以下是关于电气工程的单项选择题，请直接给出正确答案的选项。\n\n"
+"include": "_default_template_yaml"
+"task": "cmmlu_electrical_engineering"

lm_eval/tasks/cmmlu/cmmlu_elementary_chinese.yaml

+"dataset_name": "elementary_chinese"
+"description": "以下是关于小学语文的单项选择题，请直接给出正确答案的选项。\n\n"
+"include": "_default_template_yaml"
+"task": "cmmlu_elementary_chinese"

lm_eval/tasks/cmmlu/cmmlu_elementary_commonsense.yaml

+"dataset_name": "elementary_commonsense"
+"description": "以下是关于小学常识的单项选择题，请直接给出正确答案的选项。\n\n"
+"include": "_default_template_yaml"
+"task": "cmmlu_elementary_commonsense"