fix alllll the merge conflicts

lm_eval/tasks/cmmlu/cmmlu_marketing.yaml

+"dataset_name": "marketing"
+"description": "以下是关于市场营销的单项选择题，请直接给出正确答案的选项。\n\n"
+"include": "_default_template_yaml"
+"task": "cmmlu_marketing"

lm_eval/tasks/cmmlu/cmmlu_marxist_theory.yaml

+"dataset_name": "marxist_theory"
+"description": "以下是关于马克思主义理论的单项选择题，请直接给出正确答案的选项。\n\n"
+"include": "_default_template_yaml"
+"task": "cmmlu_marxist_theory"

lm_eval/tasks/cmmlu/cmmlu_modern_chinese.yaml

+"dataset_name": "modern_chinese"
+"description": "以下是关于现代汉语的单项选择题，请直接给出正确答案的选项。\n\n"
+"include": "_default_template_yaml"
+"task": "cmmlu_modern_chinese"

lm_eval/tasks/cmmlu/cmmlu_nutrition.yaml

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

lm_eval/tasks/cmmlu/cmmlu_philosophy.yaml

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

lm_eval/tasks/cmmlu/cmmlu_professional_accounting.yaml

+"dataset_name": "professional_accounting"
+"description": "以下是关于专业会计的单项选择题，请直接给出正确答案的选项。\n\n"
+"include": "_default_template_yaml"
+"task": "cmmlu_professional_accounting"

lm_eval/tasks/cmmlu/cmmlu_professional_law.yaml

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

lm_eval/tasks/cmmlu/cmmlu_professional_medicine.yaml

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

lm_eval/tasks/cmmlu/cmmlu_professional_psychology.yaml

+"dataset_name": "professional_psychology"
+"description": "以下是关于专业心理学的单项选择题，请直接给出正确答案的选项。\n\n"
+"include": "_default_template_yaml"
+"task": "cmmlu_professional_psychology"

lm_eval/tasks/cmmlu/cmmlu_public_relations.yaml

+"dataset_name": "public_relations"
+"description": "以下是关于公共关系的单项选择题，请直接给出正确答案的选项。\n\n"
+"include": "_default_template_yaml"
+"task": "cmmlu_public_relations"

lm_eval/tasks/cmmlu/cmmlu_security_study.yaml

+"dataset_name": "security_study"
+"description": "以下是关于安全研究的单项选择题，请直接给出正确答案的选项。\n\n"
+"include": "_default_template_yaml"
+"task": "cmmlu_security_study"

lm_eval/tasks/cmmlu/cmmlu_sociology.yaml

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

lm_eval/tasks/cmmlu/cmmlu_sports_science.yaml

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

lm_eval/tasks/cmmlu/cmmlu_traditional_chinese_medicine.yaml

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

lm_eval/tasks/cmmlu/cmmlu_virology.yaml

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

lm_eval/tasks/cmmlu/cmmlu_world_history.yaml

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

lm_eval/tasks/cmmlu/cmmlu_world_religions.yaml

+"dataset_name": "world_religions"
+"description": "以下是关于世界宗教的单项选择题，请直接给出正确答案的选项。\n\n"
+"include": "_default_template_yaml"
+"task": "cmmlu_world_religions"

lm_eval/tasks/copal_id/standard.yaml

-group: copal_id
+tag: copal_id
 task: copal_id_standard
 task_alias: standard
 dataset_path: haryoaw/COPAL

lm_eval/tasks/crows_pairs/crows_pairs_english.yaml

-group:
+tag:
   - crows_pairs
-  - social_bias
-  - loglikelihood
 task: crows_pairs_english
 dataset_path: BigScienceBiasEval/crows_pairs_multilingual
 dataset_name: english

lm_eval/tasks/csatqa/_csatqa.yaml

+group: csatqa
+task:
+  - csatqa_gr
+  - csatqa_li
+  - csatqa_rch
+  - csatqa_rcs
+  - csatqa_rcss
+  - csatqa_wr
+aggregate_metric_list:
+  - metric: acc
+    aggregation: mean
+    weight_by_size: true
+  - metric: acc_norm
+    aggregation: mean
+    weight_by_size: true
+metadata:
+  version: 0.0