fix conflict

lm_eval/evaluator.py

@@ -21,11 +21,7 @@
     print_writeout,
     run_task_tests,
 )
-<<<<<<< HEAD
 from lm_eval.logging.utils import add_env_info, add_tokenizer_info, get_git_commit_hash
-=======
-from lm_eval.loggers.utils import add_env_info, get_git_commit_hash
->>>>>>> upstream/main
 from lm_eval.tasks import TaskManager, get_task_dict
 from lm_eval.utils import (
     eval_logger,