resolved merge conflict

lm_eval/tasks/sciq/alternative_worlds/output_variation/style_02/b.yaml

@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
 group: sciq_alt_ov_02
 task: sciq_alt_ov_02b
 doc_to_text: !function ../styles.template_02
-doc_to_choice: !function ../styles.choice_02b
+doc_to_choice: !function ../styles.choice_02b
\ No newline at end of file

lm_eval/tasks/sciq/alternative_worlds/output_variation/style_02/c.yaml

@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
 group: sciq_alt_ov_02
 task: sciq_alt_ov_02c
 doc_to_text: !function ../styles.template_02
-doc_to_choice: !function ../styles.choice_02c
+doc_to_choice: !function ../styles.choice_02c
\ No newline at end of file

lm_eval/tasks/sciq/alternative_worlds/output_variation/style_03/a.yaml

@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
 group: sciq_alt_ov_03
 task: sciq_alt_ov_03a
 doc_to_text: !function ../styles.template_03
-doc_to_choice: !function ../styles.choice_03a
+doc_to_choice: !function ../styles.choice_03a
\ No newline at end of file

lm_eval/tasks/sciq/alternative_worlds/output_variation/style_03/b.yaml

@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
 group: sciq_alt_ov_03
 task: sciq_alt_ov_03b
 doc_to_text: !function ../styles.template_03
-doc_to_choice: !function ../styles.choice_03b
+doc_to_choice: !function ../styles.choice_03b
\ No newline at end of file

lm_eval/tasks/sciq/alternative_worlds/output_variation/style_03/c.yaml

@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
 group: sciq_alt_ov_03
 task: sciq_alt_ov_03c
 doc_to_text: !function ../styles.template_03
-doc_to_choice: !function ../styles.choice_03c
+doc_to_choice: !function ../styles.choice_03c
\ No newline at end of file

lm_eval/tasks/sciq/alternative_worlds/output_variation/style_04/a.yaml

@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
 group: sciq_alt_ov_04
 task: sciq_alt_ov_04a
 doc_to_text: !function ../styles.template_04
-doc_to_choice: !function ../styles.choice_04a
+doc_to_choice: !function ../styles.choice_04a
\ No newline at end of file

lm_eval/tasks/sciq/alternative_worlds/output_variation/style_04/b.yaml

@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
 group: sciq_alt_ov_04
 task: sciq_alt_ov_04b
 doc_to_text: !function ../styles.template_04
-doc_to_choice: !function ../styles.choice_04b
+doc_to_choice: !function ../styles.choice_04b
\ No newline at end of file

lm_eval/tasks/sciq/alternative_worlds/output_variation/style_04/c.yaml

@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
 group: sciq_alt_ov_04
 task: sciq_alt_ov_04c
 doc_to_text: !function ../styles.template_04
-doc_to_choice: !function ../styles.choice_04c
+doc_to_choice: !function ../styles.choice_04c
\ No newline at end of file

lm_eval/tasks/sciq/alternative_worlds/output_variation/style_05/a.yaml

@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
 group: sciq_alt_ov_05
 task: sciq_alt_ov_05a
 doc_to_text: !function ../styles.template_05
-doc_to_choice: !function ../styles.choice_05a
+doc_to_choice: !function ../styles.choice_05a
\ No newline at end of file

lm_eval/tasks/sciq/alternative_worlds/output_variation/style_05/b.yaml

@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
 group: sciq_alt_ov_05
 task: sciq_alt_ov_05b
 doc_to_text: !function ../styles.template_05
-doc_to_choice: !function ../styles.choice_05b
+doc_to_choice: !function ../styles.choice_05b
\ No newline at end of file

lm_eval/tasks/sciq/alternative_worlds/output_variation/style_05/c.yaml

@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
 group: sciq_alt_ov_05
 task: sciq_alt_ov_05c
 doc_to_text: !function ../styles.template_05
-doc_to_choice: !function ../styles.choice_05c
+doc_to_choice: !function ../styles.choice_05c
\ No newline at end of file

lm_eval/tasks/sciq/alternative_worlds/output_variation/style_06/a.yaml

@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
 group: sciq_alt_ov_06
 task: sciq_alt_ov_06a
 doc_to_text: !function ../styles.template_06
-doc_to_choice: !function ../styles.choice_06a
+doc_to_choice: !function ../styles.choice_06a
\ No newline at end of file

lm_eval/tasks/sciq/alternative_worlds/output_variation/style_06/b.yaml

@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
 group: sciq_alt_ov_06
 task: sciq_alt_ov_06b
 doc_to_text: !function ../styles.template_06
-doc_to_choice: !function ../styles.choice_06b
+doc_to_choice: !function ../styles.choice_06b
\ No newline at end of file

lm_eval/tasks/sciq/alternative_worlds/output_variation/style_06/c.yaml

@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
 group: sciq_alt_ov_06
 task: sciq_alt_ov_06c
 doc_to_text: !function ../styles.template_06
-doc_to_choice: !function ../styles.choice_06c
+doc_to_choice: !function ../styles.choice_06c
\ No newline at end of file

lm_eval/tasks/sciq/alternative_worlds/output_variation/style_07/a.yaml

@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
 group: sciq_alt_ov_07
 task: sciq_alt_ov_07a
 doc_to_text: !function ../styles.template_07
-doc_to_choice: !function ../styles.choice_07a
+doc_to_choice: !function ../styles.choice_07a
\ No newline at end of file

lm_eval/tasks/sciq/alternative_worlds/output_variation/style_07/b.yaml

@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
 group: sciq_alt_ov_07
 task: sciq_alt_ov_07b
 doc_to_text: !function ../styles.template_07
-doc_to_choice: !function ../styles.choice_07b
+doc_to_choice: !function ../styles.choice_07b
\ No newline at end of file

lm_eval/tasks/sciq/alternative_worlds/output_variation/style_07/c.yaml

@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
 group: sciq_alt_ov_07
 task: sciq_alt_ov_07c
 doc_to_text: !function ../styles.template_07
-doc_to_choice: !function ../styles.choice_07c
+doc_to_choice: !function ../styles.choice_07c
\ No newline at end of file

lm_eval/tasks/sciq/alternative_worlds/output_variation/style_08/a.yaml

@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
 group: sciq_alt_ov_08
 task: sciq_alt_ov_08a
 doc_to_text: !function ../styles.template_08
-doc_to_choice: !function ../styles.choice_08a
+doc_to_choice: !function ../styles.choice_08a
\ No newline at end of file

lm_eval/tasks/sciq/alternative_worlds/output_variation/style_08/b.yaml

@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
 group: sciq_alt_ov_08
 task: sciq_alt_ov_08b
 doc_to_text: !function ../styles.template_08
-doc_to_choice: !function ../styles.choice_08b
+doc_to_choice: !function ../styles.choice_08b
\ No newline at end of file

lm_eval/tasks/sciq/alternative_worlds/output_variation/style_08/c.yaml

@@ -2,4 +2,4 @@ include: ../_sciq_alt_yaml
 group: sciq_alt_ov_08
 task: sciq_alt_ov_08c
 doc_to_text: !function ../styles.template_08
-doc_to_choice: !function ../styles.choice_08c
+doc_to_choice: !function ../styles.choice_08c
\ No newline at end of file