resolved merge conflict from latest version

3e1301bb · lintangsutawika · fd9cd80f · 070d31df · 3e1301bb · fd9cd80f
Commit 3e1301bb authored Jun 04, 2024 by lintangsutawika
20 changed files
--- a/lm_eval/tasks/bigbench/multiple_choice/conceptual_combinations.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/conceptual_combinations.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/conlang_translation.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/conlang_translation.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/contextual_parametric_knowledge_conflicts.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/contextual_parametric_knowledge_conflicts.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/crash_blossom.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/crash_blossom.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/crass_ai.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/crass_ai.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/cryobiology_spanish.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/cryobiology_spanish.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/cryptonite.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/cryptonite.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/cs_algorithms.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/cs_algorithms.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/dark_humor_detection.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/dark_humor_detection.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/date_understanding.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/date_understanding.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/disambiguation_qa.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/disambiguation_qa.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/discourse_marker_prediction.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/discourse_marker_prediction.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/disfl_qa.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/disfl_qa.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/dyck_languages.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/dyck_languages.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/elementary_math_qa.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/elementary_math_qa.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/emoji_movie.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/emoji_movie.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/emojis_emotion_prediction.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/emojis_emotion_prediction.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/empirical_judgments.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/empirical_judgments.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/english_proverbs.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/english_proverbs.yaml
--- a/lm_eval/tasks/bigbench/multiple_choice/english_russian_proverbs.yaml
+++ b/lm_eval/tasks/bigbench/multiple_choice/english_russian_proverbs.yaml