fix alllll the merge conflicts

lm_eval/tasks/mmlu/generative/mmlu_abstract_algebra.yaml

@@ -2,7 +2,6 @@
 "description": "The following are multiple choice questions (with answers) about abstract\
   \ algebra.\n\n"
 "tag": "mmlu_stem_generative"
-"group_alias": "stem"
 "include": "_default_template_yaml"
 "task": "mmlu_abstract_algebra_generative"
 "task_alias": "abstract_algebra"

lm_eval/tasks/mmlu/generative/mmlu_anatomy.yaml

@@ -2,7 +2,6 @@
 "description": "The following are multiple choice questions (with answers) about anatomy.\n\
   \n"
 "tag": "mmlu_stem_generative"
-"group_alias": "stem"
 "include": "_default_template_yaml"
 "task": "mmlu_anatomy_generative"
 "task_alias": "anatomy"

lm_eval/tasks/mmlu/generative/mmlu_astronomy.yaml

@@ -2,7 +2,6 @@
 "description": "The following are multiple choice questions (with answers) about astronomy.\n\
   \n"
 "tag": "mmlu_stem_generative"
-"group_alias": "stem"
 "include": "_default_template_yaml"
 "task": "mmlu_astronomy_generative"
 "task_alias": "astronomy"

lm_eval/tasks/mmlu/generative/mmlu_business_ethics.yaml

@@ -2,7 +2,6 @@
 "description": "The following are multiple choice questions (with answers) about business\
   \ ethics.\n\n"
 "tag": "mmlu_other_generative"
-"group_alias": "other"
 "include": "_default_template_yaml"
 "task": "mmlu_business_ethics_generative"
 "task_alias": "business_ethics"

lm_eval/tasks/mmlu/generative/mmlu_clinical_knowledge.yaml

@@ -2,7 +2,6 @@
 "description": "The following are multiple choice questions (with answers) about clinical\
   \ knowledge.\n\n"
 "tag": "mmlu_other_generative"
-"group_alias": "other"
 "include": "_default_template_yaml"
 "task": "mmlu_clinical_knowledge_generative"
 "task_alias": "clinical_knowledge"

lm_eval/tasks/mmlu/generative/mmlu_college_biology.yaml

@@ -2,7 +2,6 @@
 "description": "The following are multiple choice questions (with answers) about college\
   \ biology.\n\n"
 "tag": "mmlu_stem_generative"
-"group_alias": "stem"
 "include": "_default_template_yaml"
 "task": "mmlu_college_biology_generative"
 "task_alias": "college_biology"

lm_eval/tasks/mmlu/generative/mmlu_college_chemistry.yaml

@@ -2,7 +2,6 @@
 "description": "The following are multiple choice questions (with answers) about college\
   \ chemistry.\n\n"
 "tag": "mmlu_stem_generative"
-"group_alias": "stem"
 "include": "_default_template_yaml"
 "task": "mmlu_college_chemistry_generative"
 "task_alias": "college_chemistry"

lm_eval/tasks/mmlu/generative/mmlu_college_computer_science.yaml

@@ -2,7 +2,6 @@
 "description": "The following are multiple choice questions (with answers) about college\
   \ computer science.\n\n"
 "tag": "mmlu_stem_generative"
-"group_alias": "stem"
 "include": "_default_template_yaml"
 "task": "mmlu_college_computer_science_generative"
 "task_alias": "college_computer_science"

lm_eval/tasks/mmlu/generative/mmlu_college_mathematics.yaml

@@ -2,7 +2,6 @@
 "description": "The following are multiple choice questions (with answers) about college\
   \ mathematics.\n\n"
 "tag": "mmlu_stem_generative"
-"group_alias": "stem"
 "include": "_default_template_yaml"
 "task": "mmlu_college_mathematics_generative"
 "task_alias": "college_mathematics"

lm_eval/tasks/mmlu/generative/mmlu_college_medicine.yaml

@@ -2,7 +2,6 @@
 "description": "The following are multiple choice questions (with answers) about college\
   \ medicine.\n\n"
 "tag": "mmlu_other_generative"
-"group_alias": "other"
 "include": "_default_template_yaml"
 "task": "mmlu_college_medicine_generative"
 "task_alias": "college_medicine"

lm_eval/tasks/mmlu/generative/mmlu_college_physics.yaml

@@ -2,7 +2,6 @@
 "description": "The following are multiple choice questions (with answers) about college\
   \ physics.\n\n"
 "tag": "mmlu_stem_generative"
-"group_alias": "stem"
 "include": "_default_template_yaml"
 "task": "mmlu_college_physics_generative"
 "task_alias": "college_physics"

lm_eval/tasks/mmlu/generative/mmlu_computer_security.yaml

@@ -2,7 +2,6 @@
 "description": "The following are multiple choice questions (with answers) about computer\
   \ security.\n\n"
 "tag": "mmlu_stem_generative"
-"group_alias": "stem"
 "include": "_default_template_yaml"
 "task": "mmlu_computer_security_generative"
 "task_alias": "computer_security"

lm_eval/tasks/mmlu/generative/mmlu_conceptual_physics.yaml

@@ -2,7 +2,6 @@
 "description": "The following are multiple choice questions (with answers) about conceptual\
   \ physics.\n\n"
 "tag": "mmlu_stem_generative"
-"group_alias": "stem"
 "include": "_default_template_yaml"
 "task": "mmlu_conceptual_physics_generative"
 "task_alias": "conceptual_physics"

lm_eval/tasks/mmlu/generative/mmlu_econometrics.yaml

@@ -2,7 +2,6 @@
 "description": "The following are multiple choice questions (with answers) about econometrics.\n\
   \n"
 "tag": "mmlu_social_sciences_generative"
-"group_alias": "social_sciences"
 "include": "_default_template_yaml"
 "task": "mmlu_econometrics_generative"
 "task_alias": "econometrics"

lm_eval/tasks/mmlu/generative/mmlu_electrical_engineering.yaml

@@ -2,7 +2,6 @@
 "description": "The following are multiple choice questions (with answers) about electrical\
   \ engineering.\n\n"
 "tag": "mmlu_stem_generative"
-"group_alias": "stem"
 "include": "_default_template_yaml"
 "task": "mmlu_electrical_engineering_generative"
 "task_alias": "electrical_engineering"

lm_eval/tasks/mmlu/generative/mmlu_elementary_mathematics.yaml

@@ -2,7 +2,6 @@
 "description": "The following are multiple choice questions (with answers) about elementary\
   \ mathematics.\n\n"
 "tag": "mmlu_stem_generative"
-"group_alias": "stem"
 "include": "_default_template_yaml"
 "task": "mmlu_elementary_mathematics_generative"
 "task_alias": "elementary_mathematics"

lm_eval/tasks/mmlu/generative/mmlu_formal_logic.yaml

@@ -2,7 +2,6 @@
 "description": "The following are multiple choice questions (with answers) about formal\
   \ logic.\n\n"
 "tag": "mmlu_humanities_generative"
-"group_alias": "humanities"
 "include": "_default_template_yaml"
 "task": "mmlu_formal_logic_generative"
 "task_alias": "formal_logic"

lm_eval/tasks/mmlu/generative/mmlu_global_facts.yaml

@@ -2,7 +2,6 @@
 "description": "The following are multiple choice questions (with answers) about global\
   \ facts.\n\n"
 "tag": "mmlu_other_generative"
-"group_alias": "other"
 "include": "_default_template_yaml"
 "task": "mmlu_global_facts_generative"
 "task_alias": "global_facts"

lm_eval/tasks/mmlu/generative/mmlu_high_school_biology.yaml

@@ -2,7 +2,6 @@
 "description": "The following are multiple choice questions (with answers) about high\
   \ school biology.\n\n"
 "tag": "mmlu_stem_generative"
-"group_alias": "stem"
 "include": "_default_template_yaml"
 "task": "mmlu_high_school_biology_generative"
 "task_alias": "high_school_biology"

lm_eval/tasks/mmlu/generative/mmlu_high_school_chemistry.yaml

@@ -2,7 +2,6 @@
 "description": "The following are multiple choice questions (with answers) about high\
   \ school chemistry.\n\n"
 "tag": "mmlu_stem_generative"
-"group_alias": "stem"
 "include": "_default_template_yaml"
 "task": "mmlu_high_school_chemistry_generative"
 "task_alias": "high_school_chemistry"