resolved merge conflict

6f4f9e1c · lintangsutawika · 0d5748b7 · aed90773 · 6f4f9e1c · 6f4f9e1c
Commit 6f4f9e1c authored Dec 13, 2023 by lintangsutawika
5 changed files
--- a/lm_eval/tasks/sciq/alternative_worlds/output_variation/styles.py
+++ b/lm_eval/tasks/sciq/alternative_worlds/output_variation/styles.py
--- a/lm_eval/tasks/scrolls/task.py
+++ b/lm_eval/tasks/scrolls/task.py
--- a/lm_eval/utils.py
+++ b/lm_eval/utils.py
--- a/pyproject.toml
+++ b/pyproject.toml
--- a/scripts/model_comparator.py
+++ b/scripts/model_comparator.py