fix alllll the merge conflicts

lm_eval/tasks/mmlu/generative/mmlu_medical_genetics.yaml

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

lm_eval/tasks/mmlu/generative/mmlu_miscellaneous.yaml

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

lm_eval/tasks/mmlu/generative/mmlu_moral_disputes.yaml

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

lm_eval/tasks/mmlu/generative/mmlu_moral_scenarios.yaml

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

lm_eval/tasks/mmlu/generative/mmlu_nutrition.yaml

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

lm_eval/tasks/mmlu/generative/mmlu_philosophy.yaml

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

lm_eval/tasks/mmlu/generative/mmlu_prehistory.yaml

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

lm_eval/tasks/mmlu/generative/mmlu_professional_accounting.yaml

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

lm_eval/tasks/mmlu/generative/mmlu_professional_law.yaml

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

lm_eval/tasks/mmlu/generative/mmlu_professional_medicine.yaml

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

lm_eval/tasks/mmlu/generative/mmlu_professional_psychology.yaml

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

lm_eval/tasks/mmlu/generative/mmlu_public_relations.yaml

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

lm_eval/tasks/mmlu/generative/mmlu_security_studies.yaml

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

lm_eval/tasks/mmlu/generative/mmlu_sociology.yaml

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

lm_eval/tasks/mmlu/generative/mmlu_us_foreign_policy.yaml

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

lm_eval/tasks/mmlu/generative/mmlu_virology.yaml

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

lm_eval/tasks/mmlu/generative/mmlu_world_religions.yaml

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

lm_eval/tasks/model_written_evals/advanced_ai_risk/_template_yaml

-group: advanced_ai_risk
+tag: advanced_ai_risk
 dataset_path: EleutherAI/advanced_ai_risk
 output_type: multiple_choice
 validation_split: validation

lm_eval/tasks/model_written_evals/persona/_template_yaml

-group: persona
+tag: persona
 dataset_path: EleutherAI/persona
 output_type: multiple_choice
 validation_split: validation

lm_eval/tasks/model_written_evals/sycophancy/sycophancy_on_nlp_survey.yaml

-group: sycophancy
+tag: sycophancy
 task: sycophancy_on_nlp_survey
 dataset_path: EleutherAI/sycophancy
 dataset_name: sycophancy_on_nlp_survey