resolved merge conflict from latest version

lm_eval/tasks/bigbench/multiple_choice/real_or_fake_text.yaml

 # Generated by utils.py
 dataset_name: real_or_fake_text_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_real_or_fake_text_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/reasoning_about_colored_objects.yaml

 # Generated by utils.py
 dataset_name: reasoning_about_colored_objects_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_reasoning_about_colored_objects_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/repeat_copy_logic.yaml

-# Generated by utils.py
-dataset_name: repeat_copy_logic_zero_shot
-include: ../multiple_choice_template_yaml
-task: bigbench_repeat_copy_logic_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/rephrase.yaml

-# Generated by utils.py
-dataset_name: rephrase_zero_shot
-include: ../multiple_choice_template_yaml
-task: bigbench_rephrase_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/riddle_sense.yaml

 # Generated by utils.py
 dataset_name: riddle_sense_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_riddle_sense_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/ruin_names.yaml

 # Generated by utils.py
 dataset_name: ruin_names_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_ruin_names_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/salient_translation_error_detection.yaml

 # Generated by utils.py
 dataset_name: salient_translation_error_detection_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_salient_translation_error_detection_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/scientific_press_release.yaml

-# Generated by utils.py
-dataset_name: scientific_press_release_zero_shot
-include: ../multiple_choice_template_yaml
-task: bigbench_scientific_press_release_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/semantic_parsing_in_context_sparc.yaml

-# Generated by utils.py
-dataset_name: semantic_parsing_in_context_sparc_zero_shot
-include: ../multiple_choice_template_yaml
-task: bigbench_semantic_parsing_in_context_sparc_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/semantic_parsing_spider.yaml

-# Generated by utils.py
-dataset_name: semantic_parsing_spider_zero_shot
-include: ../multiple_choice_template_yaml
-task: bigbench_semantic_parsing_spider_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/sentence_ambiguity.yaml

 # Generated by utils.py
 dataset_name: sentence_ambiguity_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_sentence_ambiguity_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/similarities_abstraction.yaml

 # Generated by utils.py
 dataset_name: similarities_abstraction_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_similarities_abstraction_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/simp_turing_concept.yaml

-# Generated by utils.py
-dataset_name: simp_turing_concept_zero_shot
-include: ../multiple_choice_template_yaml
-task: bigbench_simp_turing_concept_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/simple_arithmetic_json.yaml

-# Generated by utils.py
-dataset_name: simple_arithmetic_json_zero_shot
-include: ../multiple_choice_template_yaml
-task: bigbench_simple_arithmetic_json_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/simple_arithmetic_json_multiple_choice.yaml

-# Generated by utils.py
-dataset_name: simple_arithmetic_json_multiple_choice_zero_shot
-include: ../multiple_choice_template_yaml
-task: bigbench_simple_arithmetic_json_multiple_choice_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/simple_arithmetic_json_subtasks.yaml

-# Generated by utils.py
-dataset_name: simple_arithmetic_json_subtasks_zero_shot
-include: ../multiple_choice_template_yaml
-task: bigbench_simple_arithmetic_json_subtasks_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/simple_arithmetic_multiple_targets_json.yaml

-# Generated by utils.py
-dataset_name: simple_arithmetic_multiple_targets_json_zero_shot
-include: ../multiple_choice_template_yaml
-task: bigbench_simple_arithmetic_multiple_targets_json_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/simple_ethical_questions.yaml

 # Generated by utils.py
 dataset_name: simple_ethical_questions_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_simple_ethical_questions_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/simple_text_editing.yaml

-# Generated by utils.py
-dataset_name: simple_text_editing_zero_shot
-include: ../multiple_choice_template_yaml
-task: bigbench_simple_text_editing_multiple_choice

lm_eval/tasks/bigbench/multiple_choice/snarks.yaml

 # Generated by utils.py
 dataset_name: snarks_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_snarks_multiple_choice