resolved merge conflict from latest version

lm_eval/tasks/bbh/fewshot/multistep_arithmetic_two.yaml

-"dataset_name": "multistep_arithmetic_two"
-"description": "Solve multi-step arithmetic problems.\n\n"
-"doc_to_text": "Q: ((-5 + 9 * -4 - 0) * (4 + -7 + 0 * -5)) =\nA: 123\n\nQ: ((-9 * 7 * 7 * -9) + (4 * -9 - 8 - -4)) =\nA: 3929\n\nQ: ((-3 + 5 * 8 * -4) - (9 - 8 * -7 + -9)) =\nA: -219\n\nQ: {{input}}\nA:"
-"include": "_fewshot_template_yaml"
-"task": "bbh_fewshot_multistep_arithmetic_two"
+dataset_name: multistep_arithmetic_two
+description: 'Solve multi-step arithmetic problems.
+
+
+  '
+doc_to_text: 'Q: {{input}}
+
+  A:'
+fewshot_config:
+  sampler: first_n
+  samples:
+  - input: ((-5 + 9 * -4 - 0) * (4 + -7 + 0 * -5)) =
+    target: '123'
+  - input: ((-9 * 7 * 7 * -9) + (4 * -9 - 8 - -4)) =
+    target: '3929'
+  - input: ((-3 + 5 * 8 * -4) - (9 - 8 * -7 + -9)) =
+    target: '-219'
+include: _fewshot_template_yaml
+task: bbh_fewshot_multistep_arithmetic_two

lm_eval/tasks/bigbench/multiple_choice/abstract_narrative_understanding.yaml

 # Generated by utils.py
 dataset_name: abstract_narrative_understanding_zero_shot
-include: ../multiple_choice_template_yaml
+include: ../multiple_choice_template_a_yaml
 task: bigbench_abstract_narrative_understanding_multiple_choice