resolved merge conflict

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

@@ -3,4 +3,4 @@ group: arc_easy_alt_ov_04
 task: arc_easy_alt_ov_04b
 doc_to_text: !function ../styles.template_04
 doc_to_choice: !function ../styles.choice_04b
-doc_to_decontamination_query: !function ../styles.template_04
\ No newline at end of file
+doc_to_decontamination_query: !function ../styles.template_04

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

@@ -3,4 +3,4 @@ group: arc_easy_alt_ov_04
 task: arc_easy_alt_ov_04c
 doc_to_text: !function ../styles.template_04
 doc_to_choice: !function ../styles.choice_04c
-doc_to_decontamination_query: !function ../styles.template_04
\ No newline at end of file
+doc_to_decontamination_query: !function ../styles.template_04

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

@@ -3,4 +3,4 @@ group: arc_easy_alt_ov_05
 task: arc_easy_alt_ov_05a
 doc_to_text: !function ../styles.template_05
 doc_to_choice: !function ../styles.choice_05a
-doc_to_decontamination_query: !function ../styles.template_05
\ No newline at end of file
+doc_to_decontamination_query: !function ../styles.template_05

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

@@ -3,4 +3,4 @@ group: arc_easy_alt_ov_05
 task: arc_easy_alt_ov_05b
 doc_to_text: !function ../styles.template_05
 doc_to_choice: !function ../styles.choice_05b
-doc_to_decontamination_query: !function ../styles.template_05
\ No newline at end of file
+doc_to_decontamination_query: !function ../styles.template_05

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

@@ -3,4 +3,4 @@ group: arc_easy_alt_ov_05
 task: arc_easy_alt_ov_05c
 doc_to_text: !function ../styles.template_05
 doc_to_choice: !function ../styles.choice_05c
-doc_to_decontamination_query: !function ../styles.template_05
\ No newline at end of file
+doc_to_decontamination_query: !function ../styles.template_05

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

@@ -3,4 +3,4 @@ group: arc_easy_alt_ov_06
 task: arc_easy_alt_ov_06a
 doc_to_text: !function ../styles.template_06
 doc_to_choice: !function ../styles.choice_06a
-doc_to_decontamination_query: !function ../styles.template_06
\ No newline at end of file
+doc_to_decontamination_query: !function ../styles.template_06

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

@@ -3,4 +3,4 @@ group: arc_easy_alt_ov_06
 task: arc_easy_alt_ov_06b
 doc_to_text: !function ../styles.template_06
 doc_to_choice: !function ../styles.choice_06b
-doc_to_decontamination_query: !function ../styles.template_06
\ No newline at end of file
+doc_to_decontamination_query: !function ../styles.template_06

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

@@ -3,4 +3,4 @@ group: arc_easy_alt_ov_06
 task: arc_easy_alt_ov_06c
 doc_to_text: !function ../styles.template_06
 doc_to_choice: !function ../styles.choice_06c
-doc_to_decontamination_query: !function ../styles.template_06
\ No newline at end of file
+doc_to_decontamination_query: !function ../styles.template_06

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

@@ -3,4 +3,4 @@ group: arc_easy_alt_ov_07
 task: arc_easy_alt_ov_07a
 doc_to_text: !function ../styles.template_07
 doc_to_choice: !function ../styles.choice_07a
-doc_to_decontamination_query: !function ../styles.template_07
\ No newline at end of file
+doc_to_decontamination_query: !function ../styles.template_07

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

@@ -3,4 +3,4 @@ group: arc_easy_alt_ov_07
 task: arc_easy_alt_ov_07b
 doc_to_text: !function ../styles.template_07
 doc_to_choice: !function ../styles.choice_07b
-doc_to_decontamination_query: !function ../styles.template_07
\ No newline at end of file
+doc_to_decontamination_query: !function ../styles.template_07

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

@@ -3,4 +3,4 @@ group: arc_easy_alt_ov_07
 task: arc_easy_alt_ov_07c
 doc_to_text: !function ../styles.template_07
 doc_to_choice: !function ../styles.choice_07c
-doc_to_decontamination_query: !function ../styles.template_07
\ No newline at end of file
+doc_to_decontamination_query: !function ../styles.template_07

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

@@ -3,4 +3,4 @@ group: arc_easy_alt_ov_08
 task: arc_easy_alt_ov_08a
 doc_to_text: !function ../styles.template_08
 doc_to_choice: !function ../styles.choice_08a
-doc_to_decontamination_query: !function ../styles.template_08
\ No newline at end of file
+doc_to_decontamination_query: !function ../styles.template_08

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

@@ -3,4 +3,4 @@ group: arc_easy_alt_ov_08
 task: arc_easy_alt_ov_08b
 doc_to_text: !function ../styles.template_08
 doc_to_choice: !function ../styles.choice_08b
-doc_to_decontamination_query: !function ../styles.template_08
\ No newline at end of file
+doc_to_decontamination_query: !function ../styles.template_08

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

@@ -3,4 +3,4 @@ group: arc_easy_alt_ov_08
 task: arc_easy_alt_ov_08c
 doc_to_text: !function ../styles.template_08
 doc_to_choice: !function ../styles.choice_08c
-doc_to_decontamination_query: !function ../styles.template_08
\ No newline at end of file
+doc_to_decontamination_query: !function ../styles.template_08

lm_eval/tasks/arc/alternative_worlds/prompt_variation/style_02.yaml

@@ -2,4 +2,4 @@ include: _arc_easy_alt_yaml
 group: arc_easy_alt_pv
 task: arc_easy_alt_pv_02
 doc_to_text: "Q: {{question}}\nA:"
-doc_to_decontamination_query: "Q: {{question}}\nA:"
\ No newline at end of file
+doc_to_decontamination_query: "Q: {{question}}\nA:"

lm_eval/tasks/arc/alternative_worlds/prompt_variation/style_03.yaml

@@ -2,4 +2,4 @@ include: _arc_easy_alt_yaml
 group: arc_easy_alt_pv
 task: arc_easy_alt_pv_03
 doc_to_text: "Question: {{question}}\nAnswer:"
-doc_to_decontamination_query: "Question: {{question}}\nAnswer:"
\ No newline at end of file
+doc_to_decontamination_query: "Question: {{question}}\nAnswer:"

lm_eval/tasks/bbh/alternative_worlds/README.md

@@ -31,4 +31,4 @@
 
 Notes:
 - `web_of_lies` already starts with `Question: `
-- Tasks with options are `Options: (A) ...` (multiple choice) or `Options: - ...` (binary choice)
\ No newline at end of file
+- Tasks with options are `Options: (A) ...` (multiple choice) or `Options: - ...` (binary choice)

lm_eval/tasks/bbh/alternative_worlds/prompt_variation/style_01/zeroshot/_zeroshot_template_yaml

@@ -9,4 +9,4 @@ num_fewshot: 0
 metric_list:
   - metric: acc
   - metric: acc_norm
-  - metric: brier_score
\ No newline at end of file
+  - metric: brier_score

lm_eval/tasks/bbh/alternative_worlds/prompt_variation/style_01/zeroshot/formal_fallacies.yaml

@@ -3,4 +3,4 @@
 "include": "_zeroshot_template_yaml"
 "task": "bbh_alt_pv_01_zeroshot_formal_fallacies"
 "doc_to_target": target
-"doc_to_choice": ["valid", "invalid"]
\ No newline at end of file
+"doc_to_choice": ["valid", "invalid"]

lm_eval/tasks/bbh/alternative_worlds/prompt_variation/style_01/zeroshot/movie_recommendation.yaml

@@ -2,4 +2,4 @@
 "description": "Recommend movies similar to the given list of movies.\n\n"
 "include": "_zeroshot_template_yaml"
 "task": "bbh_alt_pv_01_zeroshot_movie_recommendation"
-"process_docs": !function ../../utils.fix_movie_recommendation
\ No newline at end of file
+"process_docs": !function ../../utils.fix_movie_recommendation